From 5becfe9004ab05be7c72891087bc6147d2a525ba Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 14 Sep 2017 20:00:17 +0000 Subject: [PATCH] Fix: warnings about individual militia errors were wrongly printed out git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8473 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 1b050927..8b2943d0 100644 --- a/Strategic/MilitiaIndividual.cpp +++ b/Strategic/MilitiaIndividual.cpp @@ -838,7 +838,7 @@ void PickIndividualMilitia( UINT8 aSector, UINT8 ubType, UINT16 aNumber ) } // 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 ( aNumber && gGameExternalOptions.fIndividualMilitia ) ScreenMsg( FONT_MCOLOR_RED, MSG_INTERFACE, L"Possible error: Not enough individual militia found in PickIndividualMilitia" ); } @@ -877,6 +877,6 @@ void DropIndividualMilitia( UINT8 aSector, UINT8 ubType, UINT16 aNumber ) } // 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 ( aNumber && gGameExternalOptions.fIndividualMilitia ) ScreenMsg( FONT_MCOLOR_RED, MSG_INTERFACE, L"Possible error: Not enough individual militia found in DropIndividualMilitia" ); }