- Fix: possible mismatch of individual militia profiles if trained militia were immediately promoted

- Fix: Armour/Misc. resources also limit training of green militia
- cleaned up button deletion

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-25 20:15:15 +00:00
parent e1f1437a95
commit 28ca52e2ed
3 changed files with 64 additions and 71 deletions
-2
View File
@@ -270,8 +270,6 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
GetResources( val_gun, val_armour, val_misc );
iTrainingSquadSize = min( iTrainingSquadSize, (INT32)val_gun );
iTrainingSquadSize = min( iTrainingSquadSize, (INT32)val_armour );
iTrainingSquadSize = min( iTrainingSquadSize, (INT32)val_misc );
}
promotionsfromvolunteers -= iTrainingSquadSize;