sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Remove extraneous commenting. Release Build 8582.

Browse Source
This commit is contained in:
sigonasr2 2024-03-29 22:54:11 -05:00
parent 3c2c19f822
commit 71acd6ef7d
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Adventures in Lestoria/SaveFile.cpp
View File

@ -184,7 +184,7 @@ const void SaveFile::SaveGame(){
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);
std::cout<<"Setting Hash to "<<fileHash<<". Writing to File..."<<std::endl;
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. 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.
utils::datafile::Write(saveSystemFile,"save_file_path"_S+"system.conf"); utils::datafile::Write(saveSystemFile,"save_file_path"_S+"system.conf");
utils::datafile metadata; utils::datafile metadata;
@ -298,7 +298,6 @@ void SaveFile::LoadFile(){
if(expectedFileHash!=fileHash){ if(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))); 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)));
LOG("Expected vs Actual: "<<expectedFileHash<<std::endl<<fileHash<<std::endl)
return; return;
} }
@ -596,7 +595,7 @@ const std::string SaveFile::CreateServerRequest(const SaveFileOperation::Operati
*/ */
const std::array uriReserved={';','/','?',':','@','&','=','+','$',',','-','_','.','!','~','*','\'','(',')','#'}; const std::array uriReserved={';','/','?',':','@','&','=','+','$',',','-','_','.','!','~','*','\'','(',')','#'};
if(c>='A'&&c<='Z'||c>='a'&&c<='z'||c>='0'&&c<='9'||std::find(uriReserved.begin(),uriReserved.end(),c)!=uriReserved.end())return std::move(str)+c; if(c>='A'&&c<='Z'||c>='a'&&c<='z'||c>='0'&&c<='9'||std::find(uriReserved.begin(),uriReserved.end(),c)!=uriReserved.end())return std::move(str)+c;
std::string convertedChar=std::format("%{:02x}",c); std::string convertedChar=std::format("%{:02x}",c);
std::for_each(convertedChar.begin(),convertedChar.end(),[](char&c){c=char(std::toupper(c));}); std::for_each(convertedChar.begin(),convertedChar.end(),[](char&c){c=char(std::toupper(c));});
return std::move(str)+convertedChar; return std::move(str)+convertedChar;

1
Adventures in Lestoria/State_GameHub.cpp
View File

@ -77,6 +77,7 @@ void State_GameHub::OnLevelLoad(){
} }
void State_GameHub::OnUserUpdate(AiL*game){ void State_GameHub::OnUserUpdate(AiL*game){
State_GameRun::OnUserUpdate(game); State_GameRun::OnUserUpdate(game);
game->ClearTimedOutGarbage(); game->ClearTimedOutGarbage();
} }
void State_GameHub::Draw(AiL*game){ void State_GameHub::Draw(AiL*game){

2
Adventures in Lestoria/Version.h
View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 8579 #define VERSION_BUILD 8582
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

2
Adventures in Lestoria/olcUTIL_DataFile.h
View File

@ -267,11 +267,9 @@ namespace olc::utils
// Value does not contain separator, so just write out // Value does not contain separator, so just write out
file << property.second.GetString(i) << ((nItems > 1) ? sSeperator : ""); file << property.second.GetString(i) << ((nItems > 1) ? sSeperator : "");
} }
std::cout<<"Written: "<<property.second.GetString(i)<<std::endl;
nItems--; nItems--;
} }
std::cout<<"Write newline."<<std::endl;
// Property written, move to next line // Property written, move to next line
file << "\n"; file << "\n";
} }

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.