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

- Fix: individual militia are not properly disbanded if player runs out of funds

Browse Source 
- Fix: wrong website names used
- Removed confusing links on militia overview website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8448 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-15 11:57:10 +00:00
parent 8e6cff9b5d
commit 561f6387cd
13 changed files with 41 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/MilitiaSquads.cpp
+1 -1
View File
@@ -664,7 +664,7 @@ void MoveMilitiaSquad(INT16 sMapX, INT16 sMapY, INT16 sTMapX, INT16 sTMapY, BOOL
StrategicRemoveMilitiaFromSector( sMapX, sMapY, ELITE_MILITIA, bElitesDestTeam );
// Flugente: move along individual militia data
MoveIndividualMilitiaProfiles( SECTOR( sMapX, sMapY ), SECTOR( sTMapX, sTMapY ), bGreensDestTeam, bRegularsDestTeam, bElitesDestTeam );
MoveIndividualMilitiaProfiles( SECTOR( sMapX, sMapY ), SECTOR( sTMapX, sTMapY ), greens, regulars, elites );
// Add half team to target sector
StrategicAddMilitiaToSector( sTMapX, sTMapY, GREEN_MILITIA, bGreensDestTeam );
Strategic/Town Militia.cpp
+13 -3
View File
@@ -2379,6 +2379,9 @@ void HandleMilitiaUpkeepPayment( void )
// Increase tally of militia removed
++uiNumMilitiaDisbanded;
++usElitesDisbanded;
// Flugente: individual militia profiles need to be adjusted
DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 0, 1 );
}
else if (MilitiaList[0].ubNumMobileRegulars > 0)
{
@@ -2387,6 +2390,8 @@ void HandleMilitiaUpkeepPayment( void )
uiMoneyUnpaid -= gGameExternalOptions.usDailyCostMobile[REGULAR_MILITIA];
++uiNumMilitiaDisbanded;
++usRegularsDisbanded;
DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 1, 0 );
}
else if (MilitiaList[0].ubNumMobileGreens > 0)
{
@@ -2395,6 +2400,8 @@ void HandleMilitiaUpkeepPayment( void )
uiMoneyUnpaid -= gGameExternalOptions.usDailyCostMobile[GREEN_MILITIA];
++uiNumMilitiaDisbanded;
++usGreenDisbanded;
DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 1, 0, 0 );
}
else if (MilitiaList[0].ubNumTownElites > 0)
{
@@ -2403,6 +2410,8 @@ void HandleMilitiaUpkeepPayment( void )
uiMoneyUnpaid -= gGameExternalOptions.usDailyCostTown[ELITE_MILITIA];
++uiNumMilitiaDisbanded;
++usElitesDisbanded;
DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 0, 1 );
}
else if (MilitiaList[0].ubNumTownRegulars > 0)
{
@@ -2411,6 +2420,8 @@ void HandleMilitiaUpkeepPayment( void )
uiMoneyUnpaid -= gGameExternalOptions.usDailyCostTown[REGULAR_MILITIA];
++uiNumMilitiaDisbanded;
++usRegularsDisbanded;
DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 0, 1, 0 );
}
else if (MilitiaList[0].ubNumTownGreens > 0)
{
@@ -2419,6 +2430,8 @@ void HandleMilitiaUpkeepPayment( void )
uiMoneyUnpaid -= gGameExternalOptions.usDailyCostTown[GREEN_MILITIA];
++uiNumMilitiaDisbanded;
++usGreenDisbanded;
DisbandIndividualMilitia( MilitiaList[0].ubSectorId, 1, 0, 0 );
}
else
{
@@ -2433,9 +2446,6 @@ void HandleMilitiaUpkeepPayment( void )
// Pay all we can
uiPayment = LaptopSaveInfo.iCurrentBalance;
// Flugente: individual militia
DisbandIndividualMilitia( MilitiaList[0].ubSectorId, usGreenDisbanded, usRegularsDisbanded, usElitesDisbanded );
// Notify player that X militia have been automatically disbanded due to debt.
CHAR16 sString[256];
swprintf( sString, New113HAMMessage[21], uiNumMilitiaDisbanded );