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

SOLDIERTYPE::bOverrideMoveSpeed to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-16 16:28:48 +02:00
parent edb26a68fe
commit d28d46d974
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ja2/SaveLoadGame.cpp
+1 -1
View File
@@ -2312,7 +2312,7 @@ BOOLEAN SOLDIERTYPE::Load(HWFILE hFile)
numBytesRead = ReadFieldByField(hFile, &this->ubDoorOpeningNoise, sizeof(ubDoorOpeningNoise), sizeof(UINT8), numBytesRead); numBytesRead = ReadFieldByField(hFile, &this->ubDoorOpeningNoise, sizeof(ubDoorOpeningNoise), sizeof(UINT8), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &this->pGroup, sizeof(pGroup), 1, numBytesRead); numBytesRead = ReadFieldByField(hFile, &this->pGroup, sizeof(pGroup), 1, numBytesRead);
numBytesRead = ReadFieldByField(hFile, &this->ubLeaveHistoryCode, sizeof(ubLeaveHistoryCode), sizeof(UINT8), numBytesRead); numBytesRead = ReadFieldByField(hFile, &this->ubLeaveHistoryCode, sizeof(ubLeaveHistoryCode), sizeof(UINT8), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &this->bOverrideMoveSpeed, sizeof(bOverrideMoveSpeed), sizeof(INT8), numBytesRead); numBytesRead = ReadFieldByField(hFile, &this->bOverrideMoveSpeed, sizeof(bOverrideMoveSpeed), sizeof(UINT16), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &this->uiTimeSoldierWillArrive, sizeof(uiTimeSoldierWillArrive), sizeof(UINT32), numBytesRead); numBytesRead = ReadFieldByField(hFile, &this->uiTimeSoldierWillArrive, sizeof(uiTimeSoldierWillArrive), sizeof(UINT32), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &this->bVehicleUnderRepairID, sizeof(bVehicleUnderRepairID), sizeof(INT8), numBytesRead); numBytesRead = ReadFieldByField(hFile, &this->bVehicleUnderRepairID, sizeof(bVehicleUnderRepairID), sizeof(INT8), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &this->iTimeCanSignElsewhere, sizeof(iTimeCanSignElsewhere), sizeof(INT32), numBytesRead); numBytesRead = ReadFieldByField(hFile, &this->iTimeCanSignElsewhere, sizeof(iTimeCanSignElsewhere), sizeof(INT32), numBytesRead);
Tactical/Soldier Control.cpp
+2 -2
View File
@@ -9105,9 +9105,9 @@ void SetSoldierAniSpeed( SOLDIERTYPE *pSoldier )
if ( pSoldier->flags.fUseMoverrideMoveSpeed ) if ( pSoldier->flags.fUseMoverrideMoveSpeed )
{ {
if (pSoldier->bOverrideMoveSpeed >= 0 && pSoldier->bOverrideMoveSpeed < TOTAL_SOLDIERS) if (pSoldier->bOverrideMoveSpeed < NOBODY)
{ {
pStatsSoldier = MercPtrs[pSoldier->bOverrideMoveSpeed]; pStatsSoldier = pSoldier->bOverrideMoveSpeed;
} }
} }
Tactical/Soldier Control.h
+1 -1
View File
@@ -1488,7 +1488,7 @@ public:
struct GROUP *pGroup; struct GROUP *pGroup;
UINT8 ubLeaveHistoryCode; UINT8 ubLeaveHistoryCode;
INT8 bOverrideMoveSpeed; SoldierID bOverrideMoveSpeed;
UINT32 uiTimeSoldierWillArrive; UINT32 uiTimeSoldierWillArrive;