mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
SOLDIERTYPE::bOverrideMoveSpeed to SoldierID
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1488,7 +1488,7 @@ public:
|
||||
|
||||
struct GROUP *pGroup;
|
||||
UINT8 ubLeaveHistoryCode;
|
||||
INT8 bOverrideMoveSpeed;
|
||||
SoldierID bOverrideMoveSpeed;
|
||||
|
||||
UINT32 uiTimeSoldierWillArrive;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user