1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update GENERAL_SAVE_INFO::sContractRehireSoldierID to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-16 00:58:16 +02:00
parent 41fc407de6
commit 98c18495c6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ja2/SaveLoadGame.cpp
+8 -8
View File
@@ -296,12 +296,12 @@ typedef struct
BOOLEAN fSkyriderEmptyHelpGiven; BOOLEAN fSkyriderEmptyHelpGiven;
BOOLEAN fEnterMapDueToContract; BOOLEAN fEnterMapDueToContract;
UINT8 ubHelicopterHitsTaken; UINT8 ubHelicopterHitsTaken;
UINT8 ubQuitType; UINT8 ubQuitType;
BOOLEAN fSkyriderSaidCongratsOnTakingSAM; BOOLEAN fSkyriderSaidCongratsOnTakingSAM;
INT16 sContractRehireSoldierID; SoldierID sContractRehireSoldierID;
GAME_OPTIONS GameOptions; GAME_OPTIONS GameOptions;
@@ -8505,7 +8505,7 @@ BOOLEAN SaveGeneralInfo( HWFILE hFile )
if( pContractReHireSoldier != NULL ) if( pContractReHireSoldier != NULL )
sGeneralInfo.sContractRehireSoldierID = pContractReHireSoldier->ubID; sGeneralInfo.sContractRehireSoldierID = pContractReHireSoldier->ubID;
else else
sGeneralInfo.sContractRehireSoldierID = -1; sGeneralInfo.sContractRehireSoldierID = NOBODY;
memcpy( &sGeneralInfo.GameOptions, &gGameOptions, sizeof( GAME_OPTIONS ) ); memcpy( &sGeneralInfo.GameOptions, &gGameOptions, sizeof( GAME_OPTIONS ) );
#ifndef BMP_RANDOM//dnl ch55 111009 #ifndef BMP_RANDOM//dnl ch55 111009
@@ -8784,7 +8784,7 @@ BOOLEAN LoadGeneralInfo( HWFILE hFile )
numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.ubHelicopterHitsTaken, sizeof(sGeneralInfo.ubHelicopterHitsTaken), sizeof(UINT8), numBytesRead); numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.ubHelicopterHitsTaken, sizeof(sGeneralInfo.ubHelicopterHitsTaken), sizeof(UINT8), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.ubQuitType, sizeof(sGeneralInfo.ubQuitType), sizeof(UINT8), numBytesRead); numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.ubQuitType, sizeof(sGeneralInfo.ubQuitType), sizeof(UINT8), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.fSkyriderSaidCongratsOnTakingSAM, sizeof(sGeneralInfo.fSkyriderSaidCongratsOnTakingSAM), sizeof(BOOLEAN), numBytesRead); numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.fSkyriderSaidCongratsOnTakingSAM, sizeof(sGeneralInfo.fSkyriderSaidCongratsOnTakingSAM), sizeof(BOOLEAN), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.sContractRehireSoldierID, sizeof(sGeneralInfo.sContractRehireSoldierID), sizeof(INT16), numBytesRead); numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.sContractRehireSoldierID, sizeof(sGeneralInfo.sContractRehireSoldierID), sizeof(UINT16), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.GameOptions, sizeof(sGeneralInfo.GameOptions), sizeof(UINT8), numBytesRead); numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.GameOptions, sizeof(sGeneralInfo.GameOptions), sizeof(UINT8), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.uiSeedNumber, sizeof(sGeneralInfo.uiSeedNumber), sizeof(UINT32), numBytesRead); numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.uiSeedNumber, sizeof(sGeneralInfo.uiSeedNumber), sizeof(UINT32), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.uiBaseJA2Clock, sizeof(sGeneralInfo.uiBaseJA2Clock), sizeof(UINT32), numBytesRead); numBytesRead = ReadFieldByField(hFile, &sGeneralInfo.uiBaseJA2Clock, sizeof(sGeneralInfo.uiBaseJA2Clock), sizeof(UINT32), numBytesRead);
@@ -9045,10 +9045,10 @@ BOOLEAN LoadGeneralInfo( HWFILE hFile )
ubQuitType = sGeneralInfo.ubQuitType; ubQuitType = sGeneralInfo.ubQuitType;
//if the soldier id is valid //if the soldier id is valid
if( sGeneralInfo.sContractRehireSoldierID == -1 ) if( sGeneralInfo.sContractRehireSoldierID == NOBODY )
pContractReHireSoldier = NULL; pContractReHireSoldier = NULL;
else else
pContractReHireSoldier = &Menptr[ sGeneralInfo.sContractRehireSoldierID ]; pContractReHireSoldier = sGeneralInfo.sContractRehireSoldierID;
memcpy( &gGameOptions, &sGeneralInfo.GameOptions, sizeof( GAME_OPTIONS ) ); memcpy( &gGameOptions, &sGeneralInfo.GameOptions, sizeof( GAME_OPTIONS ) );
#ifndef BMP_RANDOM//dnl ch55 111009 #ifndef BMP_RANDOM//dnl ch55 111009