[HaCreator] Fix null ref when simulating maps pre-big bang (tested ag…

…ainst v83 GMS)
lastbattle · Dec 14, 2022 · f40773a · f40773a
1 parent abb1ac8
commit f40773a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/HaCreator/MapSimulator/MapSimulator.cs b/HaCreator/MapSimulator/MapSimulator.cs
@@ -257,8 +257,8 @@ protected override void LoadContent()
             WzImage uiWindow1Image = (WzImage) Program.WzManager.FindWzImageByName("ui", "UIWindow.img"); //
             WzImage uiWindow2Image = (WzImage) Program.WzManager.FindWzImageByName("ui", "UIWindow2.img"); // UI_004.wz
 
-            this.bBigBangUpdate = uiWindow2Image["BigBang!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"] != null; // different rendering for pre and post-bb, to support multiple vers
-            this.bBigBang2Update = uiWindow2Image["BigBang2!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"] != null;
+            this.bBigBangUpdate = uiWindow2Image?["BigBang!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"] != null; // different rendering for pre and post-bb, to support multiple vers
+            this.bBigBang2Update = uiWindow2Image?["BigBang2!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"] != null;
 
             // BGM
             if (Program.InfoManager.BGMs.ContainsKey(mapBoard.MapInfo.bgm))

diff --git a/HaCreator/MapSimulator/MapSimulatorLoader.cs b/HaCreator/MapSimulator/MapSimulatorLoader.cs
@@ -539,7 +539,7 @@ public static MinimapItem CreateMinimapFromProperty(WzImage uiWindow1Image, WzIm
             if (mapBoard.MiniMap == null)
                 return null;
 
-            WzSubProperty minimapFrameProperty = (WzSubProperty)uiWindow2Image["MiniMap"];
+            WzSubProperty minimapFrameProperty = (WzSubProperty)uiWindow2Image?["MiniMap"];
             if (minimapFrameProperty == null) // UIWindow2 not available pre-BB.
             {
                 minimapFrameProperty = (WzSubProperty)uiWindow1Image["MiniMap"];