github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 21:33:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
rozlette 2022-06-23 21:58:08 -05:00 • committed by Kenix3
commit 447e68a659
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soh/soh/OTRGlobals.cpp
View file

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

3
soh/soh/SaveManager.cpp
View file

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