SOLDIERTYPE::bOverrideMoveSpeed to SoldierID

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
+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->pGroup, sizeof(pGroup), 1, 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->bVehicleUnderRepairID, sizeof(bVehicleUnderRepairID), sizeof(INT8), numBytesRead);
numBytesRead = ReadFieldByField(hFile, &this->iTimeCanSignElsewhere, sizeof(iTimeCanSignElsewhere), sizeof(INT32), numBytesRead);
+2 -2
View File
@@ -9105,9 +9105,9 @@ void SetSoldierAniSpeed( SOLDIERTYPE *pSoldier )
if ( pSoldier->flags.fUseMoverrideMoveSpeed )
{
if (pSoldier->bOverrideMoveSpeed >= 0 && pSoldier->bOverrideMoveSpeed < TOTAL_SOLDIERS)
if (pSoldier->bOverrideMoveSpeed < NOBODY)
{
pStatsSoldier = MercPtrs[pSoldier->bOverrideMoveSpeed];
pStatsSoldier = pSoldier->bOverrideMoveSpeed;
}
}
+1 -1
View File
@@ -1488,7 +1488,7 @@ public:
struct GROUP *pGroup;
UINT8 ubLeaveHistoryCode;
INT8 bOverrideMoveSpeed;
SoldierID bOverrideMoveSpeed;
UINT32 uiTimeSoldierWillArrive;