1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make a note in a militia's history if they were promoted due to drill

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-03-06 22:38:27 +00:00
parent 2080e787dd
commit 88f6f8cc06
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/MilitiaIndividual.cpp
+19
View File
@@ -660,11 +660,23 @@ FLOAT PromoteIndividualMilitiaInSector( UINT8 aSector, FLOAT aPointsToAdd )
PossiblyPromoteIndividualMilitia( militia ); PossiblyPromoteIndividualMilitia( militia );
if ( militia.militiarank == REGULAR_MILITIA ) if ( militia.militiarank == REGULAR_MILITIA )
{
StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), GREEN_MILITIA, 1 ); 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 ) else if ( militia.militiarank == ELITE_MILITIA )
{ {
StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), GREEN_MILITIA, 1 ); StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), GREEN_MILITIA, 1 );
StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), REGULAR_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 ); UpdateMilitia( militia );
@@ -691,8 +703,15 @@ FLOAT PromoteIndividualMilitiaInSector( UINT8 aSector, FLOAT aPointsToAdd )
PossiblyPromoteIndividualMilitia( militia ); PossiblyPromoteIndividualMilitia( militia );
if ( militia.militiarank == ELITE_MILITIA ) if ( militia.militiarank == ELITE_MILITIA )
{
StrategicPromoteMilitiaInSector( SECTORX( aSector ), SECTORY( aSector ), REGULAR_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 ); UpdateMilitia( militia );
} }