From dc78077b0f2b2ecc1f195cf2f98b8d90e96c6779 Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 6 May 2016 15:09:17 +0000 Subject: [PATCH] Fix: unneccessary individual militia created during savegame loading due to bad sector git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8203 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Create.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index cafb6a5c6..14d740e75 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -631,8 +631,9 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 * guiCurrentUniqueSoldierId++; - // Flugente: if this miltia, set individual ID - if ( tbTeam == MILITIA_TEAM ) + // Flugente: if this is a miltia, set individual ID + // do not do so during loading of a savegame + if ( tbTeam == MILITIA_TEAM && !pCreateStruct->fUseExistingSoldier ) { Soldier.usIndividualMilitiaID = GetIdOfUnusedindividualMilitia( pCreateStruct->ubSoldierClass, SECTOR( pCreateStruct->sSectorX, pCreateStruct->sSectorY ) ); }