Fixed some instances where the original OOT save is erroneously preserved or recreated, leading to another conversion next time you launched the game

This commit is contained in:
rozlette 2022-06-23 21:58:08 -05:00 committed by Kenix3
parent 0f84682bc0
commit 447e68a659
2 changed files with 1 additions and 3 deletions

View File

@ -56,7 +56,6 @@ OTRGlobals::OTRGlobals() {
context = Ship::GlobalCtx2::CreateInstance("Ship of Harkinian");
gSaveStateMgr = std::make_shared<SaveStateMgr>();
context->GetWindow()->Init();
CheckSaveFile(SRAM_SIZE);
}
OTRGlobals::~OTRGlobals() {

View File

@ -51,6 +51,7 @@ void SaveManager::Init() {
// If there is a lingering unversioned save, convert it
if (std::filesystem::exists("oot_save.sav")) {
ConvertFromUnversioned();
std::filesystem::rename("oot_save.sav", "oot_save.bak");
}
// If the global save file exist, load it. Otherwise, create it.
@ -1172,8 +1173,6 @@ void SaveManager::ConvertFromUnversioned() {
}
}
std::filesystem::rename("oot_save.sav", "oot_save.bak");
#undef SLOT_SIZE
#undef SLOT_OFFSET
}