gameflow: fix regression in parsing console commands

lahm86 · Jul 2, 2024 · f44cbcf · f44cbcf
1 parent 0a7984f
commit f44cbcf
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/src/game/console_cmd.c b/src/game/console_cmd.c
@@ -686,13 +686,19 @@ static COMMAND_RESULT Console_Cmd_Kill(const char *args)
 
 static COMMAND_RESULT Console_Cmd_StartDemo(const char *args)
 {
-    g_GameInfo.override_option = GF_START_DEMO;
+    g_GameInfo.override_gf_command = (GAMEFLOW_COMMAND) {
+        .command = GF_START_DEMO,
+        .param = 0,
+    };
     return CR_SUCCESS;
 }
 
 static COMMAND_RESULT Console_Cmd_ExitToTitle(const char *args)
 {
-    g_GameInfo.override_option = GF_EXIT_TO_TITLE;
+    g_GameInfo.override_gf_command = (GAMEFLOW_COMMAND) {
+        .command = GF_EXIT_TO_TITLE,
+        .param = 0,
+    };
     return CR_SUCCESS;
 }
 
@@ -714,7 +720,10 @@ static COMMAND_RESULT Console_Cmd_LoadGame(const char *args)
         return CR_FAILURE;
     }
 
-    g_GameInfo.override_option = GF_START_SAVED_GAME | slot_idx;
+    g_GameInfo.override_gf_command = (GAMEFLOW_COMMAND) {
+        .command = GF_START_SAVED_GAME,
+        .param = slot_idx,
+    };
     Console_Log(GS(OSD_LOAD_GAME), slot_num);
     return CR_SUCCESS;
 }
@@ -782,7 +791,10 @@ static COMMAND_RESULT Console_Cmd_Level(const char *args)
     }
 
     if (level_to_load != -1) {
-        g_GameInfo.override_option = GF_SELECT_GAME | level_to_load;
+        g_GameInfo.override_gf_command = (GAMEFLOW_COMMAND) {
+            .command = GF_SELECT_GAME,
+            .param = level_to_load,
+        };
         Console_Log(
             GS(OSD_PLAY_LEVEL), g_GameFlow.levels[level_to_load].level_title);
         return CR_SUCCESS;

diff --git a/src/game/phase/phase.c b/src/game/phase/phase.c
@@ -32,13 +32,13 @@ static void Phase_SetUnconditionally(const PHASE phase, void *arg);
 
 static GAMEFLOW_COMMAND Phase_Control(int32_t nframes)
 {
-    if (g_GameInfo.override_option != GF_PHASE_CONTINUE) {
-        const GAMEFLOW_OPTION override = g_GameInfo.override_option;
-        g_GameInfo.override_option = GF_PHASE_CONTINUE;
-        return (GAMEFLOW_COMMAND) {
-            .command = override,
+    if (g_GameInfo.override_gf_command.command != GF_PHASE_CONTINUE) {
+        const GAMEFLOW_COMMAND override = g_GameInfo.override_gf_command;
+        g_GameInfo.override_gf_command = (GAMEFLOW_COMMAND) {
+            .command = GF_PHASE_CONTINUE,
             .param = 0,
         };
+        return override;
     }
 
     if (m_Phaser && m_Phaser->control) {

diff --git a/src/global/types.h b/src/global/types.h
@@ -1465,7 +1465,7 @@ typedef struct GAME_INFO {
     int32_t select_level_num;
     bool death_counter_supported;
     GAMEFLOW_LEVEL_TYPE current_level_type;
-    GAMEFLOW_OPTION override_option;
+    GAMEFLOW_COMMAND override_gf_command;
     bool remove_guns;
     bool remove_scions;
     bool remove_ammo;

diff --git a/src/global/vars.c b/src/global/vars.c
@@ -50,7 +50,9 @@ MATRIX g_W2VMatrix = { 0 };
 LARA_INFO g_Lara = { 0 };
 ITEM_INFO *g_LaraItem = NULL;
 CAMERA_INFO g_Camera = { 0 };
-GAME_INFO g_GameInfo = { .override_option = GF_PHASE_CONTINUE, 0 };
+GAME_INFO g_GameInfo = {
+    .override_gf_command = { .command = GF_PHASE_CONTINUE, .param = 0 }, 0
+};
 int32_t g_SavedGamesCount = 0;
 int32_t g_SaveCounter = 0;
 int16_t g_CurrentLevel = -1;