miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Rename _current_data to _current_gamestrings_data.

Browse Source
This commit is contained in:
frosch
2025-04-09 20:09:28 +02:00
committed by frosch
parent ae51308615
commit 35cd05b27d
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/saveload/game_sl.cpp
+9 -9
View File
@@ -113,7 +113,7 @@ struct GSDTChunkHandler : ChunkHandler {
}
};
extern std::shared_ptr<GameStrings> _current_data;
extern std::shared_ptr<GameStrings> _current_gamestrings_data;
static std::string _game_saveload_string;
static uint32_t _game_saveload_strings;
@@ -159,21 +159,21 @@ struct GSTRChunkHandler : ChunkHandler {
{
const std::vector<SaveLoad> slt = SlCompatTableHeader(_game_language_desc, _game_language_sl_compat);
_current_data = std::make_shared<GameStrings>();
_current_gamestrings_data = std::make_shared<GameStrings>();
while (SlIterateArray() != -1) {
LanguageStrings ls;
SlObject(&ls, slt);
_current_data->raw_strings.push_back(std::move(ls));
_current_gamestrings_data->raw_strings.push_back(std::move(ls));
}
/* If there were no strings in the savegame, set GameStrings to nullptr */
if (_current_data->raw_strings.empty()) {
_current_data.reset();
if (_current_gamestrings_data->raw_strings.empty()) {
_current_gamestrings_data.reset();
return;
}
_current_data->Compile();
_current_gamestrings_data->Compile();
ReconsiderGameScriptLanguage();
}
@@ -181,11 +181,11 @@ struct GSTRChunkHandler : ChunkHandler {
{
SlTableHeader(_game_language_desc);
if (_current_data == nullptr) return;
if (_current_gamestrings_data == nullptr) return;
for (uint i = 0; i < _current_data->raw_strings.size(); i++) {
for (uint i = 0; i < _current_gamestrings_data->raw_strings.size(); i++) {
SlSetArrayIndex(i);
SlObject(&_current_data->raw_strings[i], _game_language_desc);
SlObject(&_current_gamestrings_data->raw_strings[i], _game_language_desc);
}
}
};