diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 6d13e98c..18250e72 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -90,7 +90,7 @@ INCLUDE_FOREDROP_DATA INCLUDE_MONSTER_DATA INCLUDE_PACK_KEY -bool ADMIN_MODE = true; //Enables the Unlock All button and admin console. +bool ADMIN_MODE = false; //Enables the Unlock All button and admin console. bool _DEBUG_MAP_LOAD_INFO = false; //360x240 vi2d WINDOW_SIZE={24*15,24*10}; diff --git a/Adventures in Lestoria/SaveFile.cpp b/Adventures in Lestoria/SaveFile.cpp index 43de34f3..e354a851 100644 --- a/Adventures in Lestoria/SaveFile.cpp +++ b/Adventures in Lestoria/SaveFile.cpp @@ -210,10 +210,27 @@ const void SaveFile::SaveGame(){ bool fileNoHashWrittenSuccessfully{false}; bool fileHashWrittenSuccessfully{false}; while(!fileNoHashWrittenSuccessfully||!fileHashWrittenSuccessfully){ + fileNoHashWrittenSuccessfully=false; + fileHashWrittenSuccessfully=false; + saveFile["Hash"].SetString(""); fileNoHashWrittenSuccessfully=utils::datafile::Write(saveFile,"save_file_path"_S+std::format("save.{:04}",saveFileID)+".tmp"); + + auto trim = [](std::string& s) + { + s.erase(0, s.find_first_not_of(" \\\t\n\r\f\v")); + s.erase(s.find_last_not_of(" \\\t\n\r\f\v") + 1); + for(int marker=0;marker - - @@ -686,113 +684,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 62cd122d..cbcb6dd3 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ