From fea19679ddd0d79371c587cdf6c3825d628367ea Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 4 Mar 2020 21:56:23 -0500
Subject: [PATCH] update for new bc
---
.../backwardsCompatibility/BackwardsCompatibility.tw | 7 -------
.../backwardsCompatibility/backwardsCompatibility.js | 9 +++++++++
src/init/storyInit.tw | 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/data/backwardsCompatibility/BackwardsCompatibility.tw b/src/data/backwardsCompatibility/BackwardsCompatibility.tw
index a301240cc87..29f9e342cd8 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 efa1b52568f..5d44e5d41b0 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 b10831c1e2f..0a1e8930f9f 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+) */
--
GitLab