[demo] Add in safety checks for loading and saving files. Run saves/loads repeatedly until they actually complete. Demo Patch 5. Release Build 9546.

Adventures in Lestoria/SaveFile.cpp

@@ -191,9 +191,6 @@ const void SaveFile::SaveGame(){
 			saveSystemFile["Fullscreen"].SetBool(game->IsFullscreen());
 		#pragma endregion
 		
-		saveFile["Hash"].SetString("");
-
-		
 		for(auto&[mapName,chunks]:game->minimap.GetChunkData()){
 			size_t chunkInd=0;
 			for(auto&chunk:chunks){
@@ -203,25 +200,30 @@ const void SaveFile::SaveGame(){
 		}
 
 		#pragma region Save save file and prep File Hash
-			utils::datafile::Write(saveFile,"save_file_path"_S+std::format("save.{:04}",saveFileID));
+			bool fileNoHashWrittenSuccessfully{false};
+			bool fileHashWrittenSuccessfully{false};
+			while(!fileNoHashWrittenSuccessfully||!fileHashWrittenSuccessfully){
+				saveFile["Hash"].SetString("");
+				fileNoHashWrittenSuccessfully=utils::datafile::Write(saveFile,"save_file_path"_S+std::format("save.{:04}",saveFileID));
 
-			std::string fileHash=util::GetHash("save_file_path"_S+std::format("save.{:04}",saveFileID));
+				std::string fileHash=util::GetHash("save_file_path"_S+std::format("save.{:04}",saveFileID));
-			saveFile["Hash"].SetString(fileHash);
+				saveFile["Hash"].SetString(fileHash);
 	
-			utils::datafile::Write(saveFile,"save_file_path"_S+std::format("save.{:04}",saveFileID)); //Once the hash has been computed and added, save the file a second time.
+				fileHashWrittenSuccessfully=utils::datafile::Write(saveFile,"save_file_path"_S+std::format("save.{:04}",saveFileID)); //Once the hash has been computed and added, save the file a second time.
+			}
 		#pragma endregion
 		//WARNING! DO NOT WRITE ANY CODE BELOW HERE!!!!! THE HASH HAS ALREADY BEEN WRITTEN.
 		//FILES BECOME CORRUPTED IF THE SAVE FILE IS MODIFIED FROM HERE ONWARDS.
 	}
-	utils::datafile::Write(saveSystemFile,"save_file_path"_S+"system.conf");
+	while(!utils::datafile::Write(saveSystemFile,"save_file_path"_S+"system.conf"));
 	utils::datafile metadata;
 	if(onlineMode){
 		if(std::filesystem::exists("save_file_path"_S+"metadata.dat"+"_online")){
-			utils::datafile::Read(metadata,"save_file_path"_S+"metadata.dat"+"_online");
+			while(!utils::datafile::Read(metadata,"save_file_path"_S+"metadata.dat"+"_online"));
 		}
 	}else{
 		if(std::filesystem::exists("save_file_path"_S+"metadata.dat")){
-			utils::datafile::Read(metadata,"save_file_path"_S+"metadata.dat");
+			while(!utils::datafile::Read(metadata,"save_file_path"_S+"metadata.dat"));
 		}
 	}
 	metadata.GetProperty(std::format("save{}",saveFileID)).SetReal(game->GetRunTime(),0U);
@@ -230,9 +232,9 @@ const void SaveFile::SaveGame(){
 	metadata.GetProperty(std::format("save{}",saveFileID)).SetString(game->GetPlayer()->GetClassName(),3U);
 	metadata.GetProperty(std::format("save{}",saveFileID)).SetString(std::string(SaveFile::GetSaveFileName()),4U);
 	if(!onlineMode){
-		utils::datafile::Write(metadata,"save_file_path"_S+"metadata.dat");
+		while(!utils::datafile::Write(metadata,"save_file_path"_S+"metadata.dat"));
 	}else{
-		utils::datafile::Write(metadata,"save_file_path"_S+"metadata.dat"+"_online");
+		while(!utils::datafile::Write(metadata,"save_file_path"_S+"metadata.dat"+"_online"));
 	}
 
 	utils::datafile::INITIAL_SETUP_COMPLETE=true;
@@ -327,25 +329,31 @@ void SaveFile::LoadFile(){
 			}
 			if(loadFile.HasProperty("Hash")){
 				std::string expectedFileHash=loadFile["Hash"].GetString();
-				loadFile["Hash"].SetString("");
+				bool fileNoHashWrittenSuccessfully{false};
-				utils::datafile::Write(loadFile,"save_file_path"_S+std::format("save.{:04}",saveFileID));
+				bool fileHashWrittenSuccessfully{false};
+				while(!fileNoHashWrittenSuccessfully||!fileHashWrittenSuccessfully){
+					fileNoHashWrittenSuccessfully=false;
+					fileHashWrittenSuccessfully=false;
+					loadFile["Hash"].SetString("");
+					fileNoHashWrittenSuccessfully=utils::datafile::Write(loadFile,"save_file_path"_S+std::format("save.{:04}",saveFileID));
 				
-				auto trim = [](std::string& s)
+					auto trim = [](std::string& s)
-				{
+					{
-					s.erase(0, s.find_first_not_of(" \t\n\r\f\v"));
+						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);
+						s.erase(s.find_last_not_of(" \t\n\r\f\v") + 1);
-				};
+					};
 
-				std::string fileHash=util::GetHash("save_file_path"_S+std::format("save.{:04}",saveFileID));
+					std::string fileHash=util::GetHash("save_file_path"_S+std::format("save.{:04}",saveFileID));
-				trim(fileHash); //It's possible the expected file hash has a space at the end/beginning that gets stripped out. We want to trim and match that string.
+					trim(fileHash); //It's possible the expected file hash has a space at the end/beginning that gets stripped out. We want to trim and match that string.
 
 				if(!ADMIN_MODE&&expectedFileHash!=fileHash){
 					LOG(std::format("WARNING! Filehash for file {} was not identified as proper! Will not load this file!","save_file_path"_S+std::format("save.{:04}",saveFileID)));
 					return;
 				}
 
-				loadFile["Hash"].SetString(expectedFileHash); //Now write the hash back into the file since we tampered with it.
+					loadFile["Hash"].SetString(expectedFileHash); //Now write the hash back into the file since we tampered with it.
-				utils::datafile::Write(loadFile,"save_file_path"_S+std::format("save.{:04}",saveFileID));
+					fileHashWrittenSuccessfully=utils::datafile::Write(loadFile,"save_file_path"_S+std::format("save.{:04}",saveFileID));
+				}
 			}
 		}
 		game->ResetGame();

Adventures in Lestoria/Version.h

@@ -38,8 +38,8 @@ All rights reserved.
 #pragma once
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 2
-#define VERSION_PATCH 3
+#define VERSION_PATCH 5
-#define VERSION_BUILD 11130
+#define VERSION_BUILD 11132
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a

Adventures in Lestoria/olcUTIL_DataFile.h

@@ -325,6 +325,7 @@ namespace olc::utils
 			{
 				// Write the file starting form the supplied node
 				write(n, file);
+				file.close();
 				return true;
 			}
 			return false;