From 62e1257634176877da94ba57081219cbf88445f3 Mon Sep 17 00:00:00 2001 From: Marcin Kurczewski Date: Wed, 13 Nov 2024 00:19:14 +0100 Subject: [PATCH] tr2/savegame: resolve a cosmetic todo --- src/tr2/decomp/savegame.c | 3 +++ src/tr2/game/game.c | 6 ------ src/tr2/game/savegame/common.c | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/tr2/decomp/savegame.c b/src/tr2/decomp/savegame.c index 40429b8f5..a45729780 100644 --- a/src/tr2/decomp/savegame.c +++ b/src/tr2/decomp/savegame.c @@ -933,9 +933,12 @@ int32_t __cdecl S_SaveGame( &g_LoadGameRequester, slot_num, file_name, REQ_ALIGN_LEFT, save_num_text, REQ_ALIGN_RIGHT); + g_SaveGameReqFlags1[slot_num] = g_RequesterFlags1[slot_num]; + g_SaveGameReqFlags2[slot_num] = g_RequesterFlags2[slot_num]; g_SavedLevels[slot_num] = 1; g_SaveCounter++; g_SavedGames++; + return true; } diff --git a/src/tr2/game/game.c b/src/tr2/game/game.c index baa22602e..66705f665 100644 --- a/src/tr2/game/game.c +++ b/src/tr2/game/game.c @@ -127,12 +127,6 @@ int32_t __cdecl Game_Control(int32_t nframes, const bool demo_mode) const int16_t slot_num = g_Inv_ExtraData[1]; S_SaveGame( &g_SaveGame, sizeof(SAVEGAME_INFO), slot_num); - // TODO: move me inside S_SaveGame - g_SaveGameReqFlags1[slot_num] = - g_RequesterFlags1[slot_num]; - g_SaveGameReqFlags2[slot_num] = - g_RequesterFlags2[slot_num]; - S_SaveSettings(); } else { return dir; diff --git a/src/tr2/game/savegame/common.c b/src/tr2/game/savegame/common.c index 21b961e3f..d97257d02 100644 --- a/src/tr2/game/savegame/common.c +++ b/src/tr2/game/savegame/common.c @@ -19,9 +19,6 @@ bool Savegame_Save(const int32_t slot_idx) { CreateSaveGameInfo(); S_SaveGame(&g_SaveGame, sizeof(SAVEGAME_INFO), slot_idx); - // TODO: move me inside S_SaveGame - g_SaveGameReqFlags1[slot_idx] = g_RequesterFlags1[slot_idx]; - g_SaveGameReqFlags2[slot_idx] = g_RequesterFlags2[slot_idx]; GetSavedGamesList(&g_LoadGameRequester); return true; }