From 88f6f8cc06ea576060d36f79c45a249acf265fb1 Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 6 Mar 2018 22:38:27 +0000 Subject: [PATCH] Make a note in a militia's history if they were promoted due to drill git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8539 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/MilitiaIndividual.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Strategic/MilitiaIndividual.cpp b/Strategic/MilitiaIndividual.cpp index 59783ede9..f98e951ca 100644 --- a/Strategic/MilitiaIndividual.cpp +++ b/Strategic/MilitiaIndividual.cpp @@ -660,11 +660,23 @@ FLOAT PromoteIndividualMilitiaInSector( UINT8 aSector, FLOAT aPointsToAdd ) PossiblyPromoteIndividualMilitia( militia ); if ( militia.militiarank == REGULAR_MILITIA ) + { StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), GREEN_MILITIA, 1 ); + + MILITIA_BATTLEREPORT report; + report.id = GetWorldTotalMin(); + report.flagmask |= MILITIA_BATTLEREPORT_FLAG_PROMOTED; + militia.history.push_back( report ); + } else if ( militia.militiarank == ELITE_MILITIA ) { StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), GREEN_MILITIA, 1 ); StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), REGULAR_MILITIA, 1 ); + + MILITIA_BATTLEREPORT report; + report.id = GetWorldTotalMin(); + report.flagmask |= MILITIA_BATTLEREPORT_FLAG_PROMOTED; + militia.history.push_back( report ); } UpdateMilitia( militia ); @@ -691,8 +703,15 @@ FLOAT PromoteIndividualMilitiaInSector( UINT8 aSector, FLOAT aPointsToAdd ) PossiblyPromoteIndividualMilitia( militia ); if ( militia.militiarank == ELITE_MILITIA ) + { StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), REGULAR_MILITIA, 1 ); + MILITIA_BATTLEREPORT report; + report.id = GetWorldTotalMin(); + report.flagmask |= MILITIA_BATTLEREPORT_FLAG_PROMOTED; + militia.history.push_back( report ); + } + UpdateMilitia( militia ); }