diff --git a/src/tr1/game/savegame.h b/src/tr1/game/savegame.h index d9dfd26c9..6ddc245a3 100644 --- a/src/tr1/game/savegame.h +++ b/src/tr1/game/savegame.h @@ -59,8 +59,6 @@ void Savegame_InitCurrentInfo(void); int32_t Savegame_GetLevelNumber(int32_t slot_num); -bool Savegame_Load(int32_t slot_num); -bool Savegame_Save(int32_t slot_num); bool Savegame_UpdateDeathCounters(int32_t slot_num, GAME_INFO *game_info); bool Savegame_LoadOnlyResumeInfo(int32_t slot_num, GAME_INFO *game_info); diff --git a/src/tr2/game/inventory_ring/control.c b/src/tr2/game/inventory_ring/control.c index 6aea9a1cd..22724bb4f 100644 --- a/src/tr2/game/inventory_ring/control.c +++ b/src/tr2/game/inventory_ring/control.c @@ -192,7 +192,7 @@ static GF_COMMAND M_Finish(INV_RING *const ring, const bool apply_changes) // first passport page: load game. if (apply_changes) { Inv_RemoveAllItems(); - if (!S_LoadGame(g_Inv_ExtraData[1])) { + if (!Savegame_Load(g_Inv_ExtraData[1])) { return (GF_COMMAND) { .action = GF_EXIT_TO_TITLE, }; @@ -243,8 +243,7 @@ static GF_COMMAND M_Finish(INV_RING *const ring, const bool apply_changes) } else { if (apply_changes) { Music_Unpause(); - CreateSaveGameInfo(); - S_SaveGame(g_Inv_ExtraData[1]); + Savegame_Save(g_Inv_ExtraData[1]); } return (GF_COMMAND) { .action = GF_NOOP }; } diff --git a/src/tr2/game/savegame/common.c b/src/tr2/game/savegame/common.c index bb6a73ee9..4024e2276 100644 --- a/src/tr2/game/savegame/common.c +++ b/src/tr2/game/savegame/common.c @@ -53,6 +53,11 @@ bool Savegame_Save(const int32_t slot_idx) return true; } +bool Savegame_Load(const int32_t slot_idx) +{ + return S_LoadGame(slot_idx); +} + RESUME_INFO *Savegame_GetCurrentInfo(const GF_LEVEL *const level) { ASSERT(g_SaveGame.resume != nullptr); diff --git a/src/tr2/game/shell/common.c b/src/tr2/game/shell/common.c index f314418db..ad03c3280 100644 --- a/src/tr2/game/shell/common.c +++ b/src/tr2/game/shell/common.c @@ -476,7 +476,7 @@ void Shell_Main(void) } case GF_START_SAVED_GAME: { - if (!S_LoadGame(gf_cmd.param)) { + if (!Savegame_Load(gf_cmd.param)) { gf_cmd = (GF_COMMAND) { .action = GF_EXIT_TO_TITLE }; } else { const GF_LEVEL *const level =