From fabd27c376585cab5df7f2962348a4060be1657c Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 5 Oct 2017 19:57:26 +0000 Subject: [PATCH] Fix: various individual militia issues git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8493 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/MilitiaIndividual.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Strategic/MilitiaIndividual.cpp b/Strategic/MilitiaIndividual.cpp index df5a0ef05..6ebbc98f7 100644 --- a/Strategic/MilitiaIndividual.cpp +++ b/Strategic/MilitiaIndividual.cpp @@ -714,7 +714,7 @@ void MoveIndividualMilitiaProfiles( UINT8 aSourceSector, UINT8 aTargetSector, UI } // if this feature is on and we get to this point, then there aren't enough individual militia. This is odd, the player should be informed - if ( gGameExternalOptions.fIndividualMilitia ) + if ( (usGreens + usRegulars + usElites) && gGameExternalOptions.fIndividualMilitia ) ScreenMsg( FONT_MCOLOR_RED, MSG_INTERFACE, L"Possible error: Not enough individual militia found in MoveIndividualMilitiaProfiles" ); } @@ -748,7 +748,7 @@ void DisbandIndividualMilitia( UINT8 aSector, UINT8 usGreens, UINT8 usRegulars, } // if this feature is on and we get to this point, then there aren't enough individual militia. This is odd, the player should be informed - if ( gGameExternalOptions.fIndividualMilitia ) + if ( (usGreens + usRegulars + usElites) && gGameExternalOptions.fIndividualMilitia ) ScreenMsg( FONT_MCOLOR_RED, MSG_INTERFACE, L"Possible error: Not enough individual militia found in DisbandIndividualMilitia" ); }