diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index 011ce3e0..fb99596c 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -267,7 +267,6 @@ void Game::init(void) gamesaved = false; gamesavefailed = false; savetime = "00:00"; - savearea = "nowhere"; savetrinkets = 0; intimetrial = false; @@ -5846,7 +5845,7 @@ struct Game::Summary Game::writemaingamesave(tinyxml2::XMLDocument& doc) xml::update_tag(msgs, "finalstretch", (int) map.finalstretch); - std::string legacy_summary = savearea + ", " + timestring(); + std::string legacy_summary = std::string(map.currentarea(saverx, savery)) + ", " + timestring(); xml::update_tag(msgs, "summary", legacy_summary.c_str()); @@ -6009,7 +6008,7 @@ bool Game::customsavequick(const std::string& savfile) } } - std::string legacy_summary = savearea + ", " + timestring(); + std::string legacy_summary = customleveltitle + ", " + timestring(); xml::update_tag(msgs, "summary", legacy_summary.c_str()); if(!FILESYSTEM_saveTiXml2Document(("saves/"+levelfile+".vvv").c_str(), doc)) diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h index 1c43db84..fe162807 100644 --- a/desktop_version/src/Game.h +++ b/desktop_version/src/Game.h @@ -359,7 +359,6 @@ public: bool gamesaved; bool gamesavefailed; std::string savetime; - std::string savearea; int savetrinkets; bool startscript; std::string newscript; diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp index c52613fb..55c8064e 100644 --- a/desktop_version/src/Input.cpp +++ b/desktop_version/src/Input.cpp @@ -3068,7 +3068,6 @@ static void mapmenuactionpress(const bool version2_2) music.playef(Sound_GAMESAVED); game.savetime = game.timestring(); - game.savearea = map.currentarea(game.roomx, game.roomy); game.savetrinkets = game.trinkets(); bool success; diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index bdac232e..53f29367 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -3012,7 +3012,11 @@ void maprender(void) else { size_t i; - font::print(PR_CEN, -1, FLIP(80, 8), game.savearea, 25, 255 - help.glow/2, 255 - help.glow/2); + font::print( + PR_CEN, -1, FLIP(80, 8), + map.currentarea(game.last_quicksave.saverx, game.last_quicksave.savery), + 25, 255 - help.glow/2, 255 - help.glow/2 + ); for (i = 0; i < SDL_arraysize(game.crewstats); ++i) { /* Crewmates are annoying. Their height is 21 pixels, but to flip them, diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index e6781461..c6ebe63e 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -3127,7 +3127,6 @@ void scriptclass::hardreset(void) game.gamesaved = false; game.gamesavefailed = false; game.savetime = "00:00"; - game.savearea = "nowhere"; game.savetrinkets = 0; if (!version2_2) {