From d6d4841d85127dd1ff405e2ea937a12e49f75295 Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 24 Oct 2016 18:44:13 +0000 Subject: [PATCH] When loading a savegame with version < WORKERS, set up town worker population to initial rate git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8333 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Player Command.cpp | 2 +- Strategic/strategicmap.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Strategic/Player Command.cpp b/Strategic/Player Command.cpp index af34caa9..78d42ca9 100644 --- a/Strategic/Player Command.cpp +++ b/Strategic/Player Command.cpp @@ -507,7 +507,7 @@ BOOLEAN SetThisSectorAsEnemyControlled( INT16 sMapX, INT16 sMapY, INT8 bMapZ, BO } // Flugente: reduce workforce - SectorInfo[SECTOR( sMapX, sMapY )].usWorkers = SectorExternalData[SECTOR( sMapX, sMapY )][0].maxworkers * gGameExternalOptions.dInitialWorkerRate; + SectorInfo[SECTOR( sMapX, sMapY )].usWorkers = SectorInfo[SECTOR( sMapX, sMapY )].usWorkers * gGameExternalOptions.dInitialWorkerRate; // ARM: this must be AFTER all resulting loyalty effects are resolved, or reduced mine income shown won't be accurate NotifyPlayerWhenEnemyTakesControlOfImportantSector( sMapX, sMapY, 0, fContested ); diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index cc56eacd..6c5c6198 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -5550,7 +5550,7 @@ BOOLEAN LoadStrategicInfoFromSavedFile( HWFILE hFile ) if ( guiCurrentSaveGameVersion < WORKERS ) { - SectorInfo[sectorID].usWorkers = 0; + SectorInfo[sectorID].usWorkers = SectorExternalData[sectorID][0].maxworkers * gGameExternalOptions.dInitialWorkerRate; SectorInfo[sectorID].ubWorkerTrainingHundredths = 0; } }