rename option, move gameflow and config check, tweak behavior

walkawayy · Sep 5, 2023 · de1a50a · de1a50a
1 parent a9d3cc1
commit de1a50a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/bin/cfg/Tomb1Main_gameflow.json5 b/bin/cfg/Tomb1Main_gameflow.json5
@@ -15,7 +15,7 @@
 
     // forces whether save crystals are enabled or not
     // overrides the config option enable_save_crystals
-    "enable_save_crystals_option": true,
+    "force_enable_save_crystals": false,
 
     // seconds to pass in the main menu before playing the demo
     "demo_delay": 16,

diff --git a/bin/cfg/Tomb1Main_gameflow_ub.json5 b/bin/cfg/Tomb1Main_gameflow_ub.json5
@@ -5,7 +5,7 @@
     "savegame_fmt_legacy": "saveuba.%d",
     "savegame_fmt_bson": "save_trub_%02d.dat",
     "disable_game_modes ": false,
-    "enable_save_crystals_option": true,
+    "force_enable_save_crystals": false,
     "demo_delay": 16,
     "water_color": [0.45, 1.0, 1.0],
     "draw_distance_fade": 22,

diff --git a/src/game/gameflow.c b/src/game/gameflow.c
@@ -231,14 +231,8 @@ static bool GameFlow_LoadScriptMeta(struct json_object_s *obj)
     g_GameFlow.disable_game_modes =
         json_object_get_bool(obj, "disable_game_modes ", false);
 
-    g_GameFlow.enable_save_crystals_option =
-        json_object_get_bool(obj, "enable_save_crystals_option", false);
-    g_Config.enable_save_crystals &= g_GameFlow.enable_save_crystals_option;
-    LOG_DEBUG(
-        "g_GameFlow.enable_save_crystals_option: %d",
-        g_GameFlow.enable_save_crystals_option);
-    LOG_DEBUG(
-        "g_Config.enable_save_crystals: %d", g_Config.enable_save_crystals);
+    g_GameFlow.force_enable_save_crystals =
+        json_object_get_bool(obj, "force_enable_save_crystals", false);
 
     tmp_arr = json_object_get_array(obj, "water_color");
     g_GameFlow.water_color.r = 0.6;
@@ -1117,6 +1111,10 @@ bool GameFlow_LoadFromFile(const char *file_name)
     g_InvItemControls.string = g_GameFlow.strings[GS_INV_ITEM_CONTROLS];
     g_InvItemLarasHome.string = g_GameFlow.strings[GS_INV_ITEM_LARAS_HOME];
 
+    if (g_GameFlow.force_enable_save_crystals) {
+        g_Config.enable_save_crystals = true;
+    }
+
     return result;
 }
 

diff --git a/src/game/gameflow.h b/src/game/gameflow.h
@@ -67,7 +67,7 @@ typedef struct GAMEFLOW {
     int8_t has_demo;
     int32_t demo_delay;
     bool disable_game_modes;
-    bool enable_save_crystals_option;
+    bool force_enable_save_crystals;
     GAMEFLOW_LEVEL *levels;
     char *strings[GS_NUMBER_OF];
     RGBF water_color;