From 35cd05b27dc1b8b2d156c5036eab9d99a0164084 Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 9 Apr 2025 20:09:28 +0200 Subject: [PATCH] Codechange: Rename _current_data to _current_gamestrings_data. --- src/game/game_text.cpp | 28 ++++++++++++++-------------- src/saveload/game_sl.cpp | 18 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/game/game_text.cpp b/src/game/game_text.cpp index dfb170e934..5a7aa0365c 100644 --- a/src/game/game_text.cpp +++ b/src/game/game_text.cpp @@ -311,7 +311,7 @@ void GameStrings::Compile() } /** The currently loaded game strings. */ -std::shared_ptr _current_data = nullptr; +std::shared_ptr _current_gamestrings_data = nullptr; /** * Get the string pointer of a particular game string. @@ -320,8 +320,8 @@ std::shared_ptr _current_data = nullptr; */ std::string_view GetGameStringPtr(StringIndexInTab id) { - if (_current_data == nullptr || _current_data->cur_language == nullptr || id.base() >= _current_data->cur_language->lines.size()) return GetStringPtr(STR_UNDEFINED); - return _current_data->cur_language->lines[id]; + if (_current_gamestrings_data == nullptr || _current_gamestrings_data->cur_language == nullptr || id.base() >= _current_gamestrings_data->cur_language->lines.size()) return GetStringPtr(STR_UNDEFINED); + return _current_gamestrings_data->cur_language->lines[id]; } /** @@ -334,8 +334,8 @@ const StringParams &GetGameStringParams(StringIndexInTab id) /* An empty result for STR_UNDEFINED. */ static StringParams empty; - if (id.base() >= _current_data->string_params.size()) return empty; - return _current_data->string_params[id]; + if (id.base() >= _current_gamestrings_data->string_params.size()) return empty; + return _current_gamestrings_data->string_params[id]; } /** @@ -348,8 +348,8 @@ const std::string &GetGameStringName(StringIndexInTab id) /* The name for STR_UNDEFINED. */ static const std::string undefined = "STR_UNDEFINED"; - if (id.base() >= _current_data->string_names.size()) return undefined; - return _current_data->string_names[id]; + if (id.base() >= _current_gamestrings_data->string_names.size()) return undefined; + return _current_gamestrings_data->string_names[id]; } /** @@ -358,8 +358,8 @@ const std::string &GetGameStringName(StringIndexInTab id) */ void RegisterGameTranslation(Squirrel *engine) { - _current_data = LoadTranslations(); - if (_current_data == nullptr) return; + _current_gamestrings_data = LoadTranslations(); + if (_current_gamestrings_data == nullptr) return; HSQUIRRELVM vm = engine->GetVM(); sq_pushroottable(vm); @@ -367,7 +367,7 @@ void RegisterGameTranslation(Squirrel *engine) if (SQ_FAILED(sq_get(vm, -2))) return; int idx = 0; - for (const auto &p : _current_data->string_names) { + for (const auto &p : _current_gamestrings_data->string_names) { sq_pushstring(vm, p, -1); sq_pushinteger(vm, idx); sq_rawset(vm, -3); @@ -384,15 +384,15 @@ void RegisterGameTranslation(Squirrel *engine) */ void ReconsiderGameScriptLanguage() { - if (_current_data == nullptr) return; + if (_current_gamestrings_data == nullptr) return; std::string language = FS2OTTD(_current_language->file.stem()); - for (auto &p : _current_data->compiled_strings) { + for (auto &p : _current_gamestrings_data->compiled_strings) { if (p.language == language) { - _current_data->cur_language = &p; + _current_gamestrings_data->cur_language = &p; return; } } - _current_data->cur_language = &_current_data->compiled_strings[0]; + _current_gamestrings_data->cur_language = &_current_gamestrings_data->compiled_strings[0]; } diff --git a/src/saveload/game_sl.cpp b/src/saveload/game_sl.cpp index af9512c22b..769f8e030a 100644 --- a/src/saveload/game_sl.cpp +++ b/src/saveload/game_sl.cpp @@ -113,7 +113,7 @@ struct GSDTChunkHandler : ChunkHandler { } }; -extern std::shared_ptr _current_data; +extern std::shared_ptr _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 slt = SlCompatTableHeader(_game_language_desc, _game_language_sl_compat); - _current_data = std::make_shared(); + _current_gamestrings_data = std::make_shared(); 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); } } };