From d28d46d9740b44a29910420b67c1ef76404d6242 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Sat, 16 Nov 2024 16:28:48 +0200
Subject: [PATCH] SOLDIERTYPE::bOverrideMoveSpeed to SoldierID

---
 Ja2/SaveLoadGame.cpp         | 2 +-
 Tactical/Soldier Control.cpp | 4 ++--
 Tactical/Soldier Control.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Ja2/SaveLoadGame.cpp b/Ja2/SaveLoadGame.cpp
index 9b626576..9e43a098 100644
--- a/Ja2/SaveLoadGame.cpp
+++ b/Ja2/SaveLoadGame.cpp
@@ -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);
diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index e3675f52..f7b40549 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -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;
 		}
 	}
 
diff --git a/Tactical/Soldier Control.h b/Tactical/Soldier Control.h
index f890d694..d4a5ccd6 100644
--- a/Tactical/Soldier Control.h	
+++ b/Tactical/Soldier Control.h	
@@ -1488,7 +1488,7 @@ public:
 
 	struct GROUP			*pGroup;
 	UINT8				ubLeaveHistoryCode;
-	INT8					bOverrideMoveSpeed;
+	SoldierID			bOverrideMoveSpeed;
 
 	UINT32				uiTimeSoldierWillArrive;