mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Replace GetSavegameFormat's compression output pointer with reference. 

This parameter must always be present and is not checked, so a reference is safer.
pull/12850/head
Peter Nelson 2024-07-09 17:08:11 +01:00
parent 100dd7b6d1
commit 94c08e56ee
No known key found for this signature in database
GPG Key ID: 8EF8F0A467DF75ED
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/saveload/saveload.cpp
View File

@ -2679,10 +2679,10 @@ static const SaveLoadFormat _saveload_formats[] = {
* Return the savegameformat of the game. Whether it was created with ZLIB compression * Return the savegameformat of the game. Whether it was created with ZLIB compression
* uncompressed, or another type * uncompressed, or another type
* @param full_name Name of the savegame format. If empty it picks the first available one * @param full_name Name of the savegame format. If empty it picks the first available one
* @param compression_level Output for telling what compression level we want. * @param[out] compression_level Output for telling what compression level we want.
* @return Reference to SaveLoadFormat struct giving all characteristics of this type of savegame * @return Reference to SaveLoadFormat struct giving all characteristics of this type of savegame
*/ */
static const SaveLoadFormat &GetSavegameFormat(const std::string &full_name, uint8_t *compression_level) static const SaveLoadFormat &GetSavegameFormat(const std::string &full_name, uint8_t &compression_level)
{ {
/* Find default savegame format, the highest one with which files can be written. */ /* Find default savegame format, the highest one with which files can be written. */
auto it = std::find_if(std::rbegin(_saveload_formats), std::rend(_saveload_formats), [](const auto &slf) { return slf.init_write != nullptr; }); auto it = std::find_if(std::rbegin(_saveload_formats), std::rend(_saveload_formats), [](const auto &slf) { return slf.init_write != nullptr; });
@ -2698,7 +2698,7 @@ static const SaveLoadFormat &GetSavegameFormat(const std::string &full_name, uin
for (const auto &slf : _saveload_formats) { for (const auto &slf : _saveload_formats) {
if (slf.init_write != nullptr && name.compare(slf.name) == 0) { if (slf.init_write != nullptr && name.compare(slf.name) == 0) {
*compression_level = slf.default_compression; compression_level = slf.default_compression;
if (has_comp_level) { if (has_comp_level) {
const std::string complevel(full_name, separator + 1); const std::string complevel(full_name, separator + 1);
@ -2709,7 +2709,7 @@ static const SaveLoadFormat &GetSavegameFormat(const std::string &full_name, uin
SetDParamStr(0, complevel); SetDParamStr(0, complevel);
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL, WL_CRITICAL); ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL, WL_CRITICAL);
} else { } else {
*compression_level = level; compression_level = level;
} }
} }
return slf; return slf;
@ -2720,7 +2720,7 @@ static const SaveLoadFormat &GetSavegameFormat(const std::string &full_name, uin
SetDParamStr(1, def.name); SetDParamStr(1, def.name);
ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM, WL_CRITICAL); ShowErrorMessage(STR_CONFIG_ERROR, STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM, WL_CRITICAL);
} }
*compression_level = def.default_compression; compression_level = def.default_compression;
return def; return def;
} }
@ -2806,7 +2806,7 @@ static SaveOrLoadResult SaveFileToDisk(bool threaded)
{ {
try { try {
uint8_t compression; uint8_t compression;
const SaveLoadFormat &fmt = GetSavegameFormat(_savegame_format, &compression); const SaveLoadFormat &fmt = GetSavegameFormat(_savegame_format, compression);
/* We have written our stuff to memory, now write it to file! */ /* We have written our stuff to memory, now write it to file! */
uint32_t hdr[2] = { fmt.tag, TO_BE32(SAVEGAME_VERSION << 16) }; uint32_t hdr[2] = { fmt.tag, TO_BE32(SAVEGAME_VERSION << 16) };