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

Make sure file hash does not include the | character due to emscripten using it to split a save request.

Browse Source
This commit is contained in:
sigonasr2 2024-03-29 22:18:00 -05:00
parent ad79910848
commit 3c2c19f822
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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,6 +298,7 @@ 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;
} }

2
Adventures in Lestoria/olcUTIL_DataFile.h
View File

@ -267,9 +267,11 @@ 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";
} }

5
Adventures in Lestoria/util.cpp
View File

@ -161,13 +161,14 @@ std::string util::GetHash(std::string fileName){
hashChar=hash[hashIndex]; hashChar=hash[hashIndex];
} }
char newChar=file.get(); char newChar=file.get();
if(newChar=='\r'||newChar=='\n')continue; if(newChar=='\r'||newChar=='\f'||newChar=='\n')continue;
hashChar+=newChar*21-7; hashChar+=newChar*21-7;
hashChar^=hashIndex; hashChar^=hashIndex;
if(hashIndex>0)hashChar+=hash[hashIndex-1]; if(hashIndex>0)hashChar+=hash[hashIndex-1];
hashChar%=94; hashChar%=94;
hashChar+=32; hashChar+=32;
if(hashChar=='"'){hashChar+=60;} if(hashChar=='"'||hashChar==',')hashChar+=60;
if(hashChar=='|')hashChar++; //FORBIDDEN CHARACTER IN EMSCRIPTEN BUILD!
if(hash.size()<std::numeric_limits<uint8_t>::max()){ if(hash.size()<std::numeric_limits<uint8_t>::max()){
hash+=hashChar; hash+=hashChar;
}else{ }else{