diff --git a/Tactical/Handle UI.cpp b/Tactical/Handle UI.cpp index aba46b8a..fcae5d59 100644 --- a/Tactical/Handle UI.cpp +++ b/Tactical/Handle UI.cpp @@ -423,9 +423,6 @@ BOOLEAN gRubberBandActive = FALSE; BOOLEAN gfIgnoreOnSelectedGuy = FALSE; BOOLEAN gfViewPortAdjustedForSouth = FALSE; -INT16 guiCreateGuyIndex = 0; -// Temp values for placing bad guys -INT16 guiCreateBadGuyIndex = 8; // FLAGS // These flags are set for a single frame execution and then are reset for the next iteration. @@ -3304,35 +3301,6 @@ void HandleObjectHighlighting( ) } -void AdjustSoldierCreationStartValues( ) -{ - INT32 cnt; - SOLDIERTYPE *pSoldier; - - cnt = gTacticalStatus.Team[ gbPlayerNum ].bFirstID; - guiCreateGuyIndex = (INT16)cnt; - - for ( pSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ gbPlayerNum ].bLastID; pSoldier++, ++cnt ) - { - if ( !pSoldier->bActive ) - { - guiCreateGuyIndex = (INT16)cnt; - break; - } - } - - cnt = gTacticalStatus.Team[ gbPlayerNum ].bLastID + 1; - guiCreateBadGuyIndex = (INT16)cnt; - - for ( pSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ LAST_TEAM ].bLastID; pSoldier++, ++cnt ) - { - if ( !pSoldier->bActive && cnt > gTacticalStatus.Team[ gbPlayerNum ].bLastID ) - { - guiCreateBadGuyIndex = (INT16)cnt; - break; - } - } -} BOOLEAN SelectedMercCanAffordAttack( ) { diff --git a/Tactical/Handle UI.h b/Tactical/Handle UI.h index 717ddc8c..acfc4cab 100644 --- a/Tactical/Handle UI.h +++ b/Tactical/Handle UI.h @@ -292,9 +292,6 @@ void HandleObjectHighlighting( ); extern BOOLEAN gfUIForceReExamineCursorData; -extern INT16 guiCreateGuyIndex; -extern INT16 guiCreateBadGuyIndex; - // WANNE: Calculate the APs to turn around INT16 APsToTurnAround(SOLDIERTYPE *pSoldier, INT32 sAdjustedGridNo); @@ -315,7 +312,6 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent ); void QueryRTLeftButton( UINT32 *puiNewEvent ); void QueryRTRightButton( UINT32 *puiNewEvent ); -void AdjustSoldierCreationStartValues( ); BOOLEAN SelectedMercCanAffordAttack( ); BOOLEAN SelectedMercCanAffordMove( ); diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index 2b78ad20..d8a44a4b 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -3294,7 +3294,6 @@ BOOLEAN LoadWorld(const STR8 puiFilename, FLOAT* pMajorMapVersion, UINT8* pMinor if(gusSelectedSoldier->bActive == FALSE) gusSelectedSoldier = NOBODY; } - AdjustSoldierCreationStartValues(); RenderProgressBar(0, 60); InvalidateWorldRedundency(); // SAVE FILENAME @@ -3327,7 +3326,6 @@ BOOLEAN NewWorld( INT32 nMapRows, INT32 nMapCols ) UINT16 NewIndex; INT32 cnt; - AdjustSoldierCreationStartValues( ); TrashWorld();