Engine: fixed restoring GUI from a save

ivan-mogilko · ivan-mogilko · commit fb8f38875ce5 · 2024-10-03T00:22:36.000+03:00
diff --git a/Common/gui/guimain.cpp b/Common/gui/guimain.cpp
@@ -679,7 +679,7 @@ void GUIMain::ReadFromSavegame(Common::Stream *in, GuiSvgVersion svg_version, st
     MouseWasAt.Y = in->ReadInt32();
 
     // Control refs
-    if (svg_version >= kGuiSvgVersion_36200)
+    if (svg_version >= kGuiSvgVersion_36200 && (svg_version < kGuiSvgVersion_400 || svg_version >= kGuiSvgVersion_40010))
     {
         uint32_t ctrl_count = in->ReadInt32();
         ctrl_refs.resize(ctrl_count);
diff --git a/Engine/game/savegame_components.cpp b/Engine/game/savegame_components.cpp
@@ -610,6 +610,7 @@ HSaveError ReadGUI(Stream *in, int32_t cmp_ver, soff_t cmp_size, const Preserved
     std::vector<std::vector<GUIMain::ControlRef>> guictrl_refs(game.numgui);
     for (int i = 0; i < game.numgui; ++i)
     {
+        guis[i].ReadFromSavegame(in, svg_ver, guictrl_refs[i]);
         if (svg_ver >= kGuiSvgVersion_40008)
             Properties::ReadValues(play.guiProps[i], in);
     }

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ void GUIMain::ReadFromSavegame(Common::Stream *in, GuiSvgVersion svg_version, st`
`679`	`679`	`MouseWasAt.Y = in->ReadInt32();`
`680`	`680`
`681`	`681`	`// Control refs`
`682`		`- if (svg_version >= kGuiSvgVersion_36200)`
	`682`	`+ if (svg_version >= kGuiSvgVersion_36200 && (svg_version < kGuiSvgVersion_400 \|\| svg_version >= kGuiSvgVersion_40010))`
`683`	`683`	`{`
`684`	`684`	`uint32_t ctrl_count = in->ReadInt32();`
`685`	`685`	`ctrl_refs.resize(ctrl_count);`
Original file line number	Diff line number	Diff line change
`@@ -610,6 +610,7 @@ HSaveError ReadGUI(Stream *in, int32_t cmp_ver, soff_t cmp_size, const Preserved`
`610`	`610`	`std::vector<std::vector<GUIMain::ControlRef>> guictrl_refs(game.numgui);`
`611`	`611`	`for (int i = 0; i < game.numgui; ++i)`
`612`	`612`	`{`
	`613`	`+ guis[i].ReadFromSavegame(in, svg_ver, guictrl_refs[i]);`
`613`	`614`	`if (svg_ver >= kGuiSvgVersion_40008)`
`614`	`615`	`Properties::ReadValues(play.guiProps[i], in);`
`615`	`616`	`}`