diff --git a/src/data/backwardsCompatibility/BackwardsCompatibility.tw b/src/data/backwardsCompatibility/BackwardsCompatibility.tw index a301240cc87f33cb73b6c8ac6a7fc5e884928db1..29f9e342cd8e7a049750350bf0a9d7f52f8f4096 100644 --- a/src/data/backwardsCompatibility/BackwardsCompatibility.tw +++ b/src/data/backwardsCompatibility/BackwardsCompatibility.tw @@ -13,13 +13,6 @@ <<= App.Update.globalVariables()>> </div> -<<if ndef $lastWeeksCashIncome>> - <<setupLastWeeksCash>> -<</if>> -<<if ndef $lastWeeksRepIncome>> - <<setupLastWeeksRep>> -<</if>> - <div> <<= App.Update.slaveVariables()>> </div> diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index efa1b52568f4490c266364d20a246ef08b55e79d..5d44e5d41b0a8c6fbe66b96ab2ced3bc2966ed05 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -36,6 +36,15 @@ App.Update.globalVariables = function() { V.nationalities = weightedArray2HashMap(V.nationalities); } + // Records + if (jQuery.isEmptyObject(V.lastWeeksCashIncome)) { + setupLastWeeksCash(); + } + + if (jQuery.isEmptyObject(V.lastWeeksRepIncome)) { + setupLastWeeksRep(); + } + // Slave mods/surgery { if (typeof V.brandTarget === "string") { diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index b10831c1e2f0e5c2f21bb7779e57454cb2625521..0a1e8930f9f42dd732e3ab3d054a794c7816eadc 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -21,8 +21,8 @@ You should have received a copy of the GNU General Public License along with thi <<run App.Update.slaveLoopInit()>> /* 0 out the record books as we start a new game */ -<<setupLastWeeksCash>> -<<setupLastWeeksRep>> +<<run setupLastWeeksCash()>> +<<run setupLastWeeksRep()>> <<if $saveImported == 0>> /* new game (not NG+) */