If not enough militia can be trained due to a lack of volunteers, excess trainign goes into militia promotions instead.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7767 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-03-05 22:04:53 +00:00
parent f3553cf888
commit 5b5f24401c
6 changed files with 185 additions and 227 deletions
+5 -3
View File
@@ -7674,15 +7674,17 @@ void DisplayMilitiaGroupBox()
SetFont( FONT12ARIAL );
if ( GetVolunteerPool() >= 2 * gGameExternalOptions.iTrainingSquadSize )
INT32 volunteers = GetVolunteerPool();
if ( volunteers >= 2 * gGameExternalOptions.iTrainingSquadSize )
SetFontForeground( FONT_FCOLOR_GREEN );
else if ( GetVolunteerPool( ) >= gGameExternalOptions.iTrainingSquadSize )
else if ( volunteers >= gGameExternalOptions.iTrainingSquadSize )
SetFontForeground( FONT_FCOLOR_YELLOW );
else
SetFontForeground( FONT_FCOLOR_RED );
// header
swprintf( sVolunteerString, szMilitiaStrategicMovementText[8], GetVolunteerPool( ), CalcHourlyVolunteerGain( ) );
swprintf( sVolunteerString, szMilitiaStrategicMovementText[8], volunteers, CalcHourlyVolunteerGain( ) );
mprintf( MapScreenRect.iLeft + 20, MapScreenRect.iBottom - 10, sVolunteerString );
}