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

Fix: Make sure MILITIA_VOLUNTEER_POOL_MULTIPLIER_FARM is not applied to farms inside towns

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-05-16 21:54:16 +00:00
parent 52b7de54e1
commit f945d164af
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Town Militia.cpp
+3 -6
View File
@@ -2113,12 +2113,6 @@ FLOAT CalcHourlyVolunteerGain()
if ( StrategicMap[CALCULATE_STRATEGIC_INDEX( sX, sY )].fEnemyControlled ) if ( StrategicMap[CALCULATE_STRATEGIC_INDEX( sX, sY )].fEnemyControlled )
continue; continue;
UINT8 sector = SECTOR( sX, sY );
// modifier increase for every farm we control
if ( IsSectorFarm( sX, sY ) )
populationmodifier += gGameExternalOptions.dMilitiaVolunteerMultiplierFarm;
UINT8 ubTownID = StrategicMap[CALCULATE_STRATEGIC_INDEX( sX, sY )].bNameId; UINT8 ubTownID = StrategicMap[CALCULATE_STRATEGIC_INDEX( sX, sY )].bNameId;
if ( ubTownID != BLANK_SECTOR ) if ( ubTownID != BLANK_SECTOR )
{ {
@@ -2126,6 +2120,9 @@ FLOAT CalcHourlyVolunteerGain()
loyalpopulation += gTownLoyalty[ubTownID].ubRating * population / 100; loyalpopulation += gTownLoyalty[ubTownID].ubRating * population / 100;
} }
// modifier increase for every farm we control
else if ( IsSectorFarm( sX, sY ) )
populationmodifier += gGameExternalOptions.dMilitiaVolunteerMultiplierFarm;
} }
} }