dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saveload: Change SlLoadFromBuffer to take a template functor

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-11-17 00:29:34 +00:00
parent f24cdc1fc9
commit dc03bac241
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saveload/company_sl.cpp
View File

@@ -591,7 +591,7 @@ static void Load_PLYP()
ReadBuffer::GetCurrent()->CopyBytes(buffer.data(), buffer.size());
if (crypto_unlock(buffer.data(), _network_company_password_storage_key, nonce, mac, buffer.data(), buffer.size()) == 0) {
SlLoadFromBuffer(buffer.data(), buffer.size(), [](void *) {
SlLoadFromBuffer(buffer.data(), buffer.size(), []() {
_network_company_server_id.resize(SlReadUint32());
ReadBuffer::GetCurrent()->CopyBytes((uint8 *)_network_company_server_id.data(), _network_company_server_id.size());
@@ -605,7 +605,7 @@ static void Load_PLYP()
}
ReadBuffer::GetCurrent()->SkipBytes(SlReadByte()); // Skip padding
}, nullptr);
});
DEBUG(sl, 2, "Decrypted company passwords");
} else {
DEBUG(sl, 2, "Failed to decrypt company passwords");