Codechange: [Script] Move currently loaded game strings out of global namespace

Author: glx22

src/game/game_text.cpp

@@ -311,7 +311,7 @@ void GameStrings::Compile()
 }
 
 /** The currently loaded game strings. */
-std::shared_ptr<GameStrings> _current_data = nullptr;
+/* static */ std::shared_ptr<GameStrings> GameStrings::data = nullptr;
 
 /**
  * Get the string pointer of a particular game string.
@@ -320,8 +320,8 @@ std::shared_ptr<GameStrings> _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 (GameStrings::data == nullptr || GameStrings::data->cur_language == nullptr || id.base() >= GameStrings::data->cur_language->lines.size()) return GetStringPtr(STR_UNDEFINED);
+	return 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() >= GameStrings::data->string_params.size()) return empty;
+	return 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() >= GameStrings::data->string_names.size()) return undefined;
+	return GameStrings::data->string_names[id];
 }
 
 /**
@@ -358,16 +358,16 @@ const std::string &GetGameStringName(StringIndexInTab id)
  */
 void RegisterGameTranslation(Squirrel *engine)
 {
-	_current_data = LoadTranslations();
-	if (_current_data == nullptr) return;
+	GameStrings::data = LoadTranslations();
+	if (GameStrings::data == nullptr) return;
 
 	HSQUIRRELVM vm = engine->GetVM();
 	sq_pushroottable(vm);
 	sq_pushstring(vm, "GSText", -1);
 	if (SQ_FAILED(sq_get(vm, -2))) return;
 
 	int idx = 0;
-	for (const auto &p : _current_data->string_names) {
+	for (const auto &p : 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 (GameStrings::data == nullptr) return;
 
 	std::string language = FS2OTTD(_current_language->file.stem());
-	for (auto &p : _current_data->compiled_strings) {
+	for (auto &p : GameStrings::data->compiled_strings) {
 		if (p.language == language) {
-			_current_data->cur_language = &p;
+			GameStrings::data->cur_language = &p;
 			return;
 		}
 	}
 
-	_current_data->cur_language = &_current_data->compiled_strings[0];
+	GameStrings::data->cur_language = &GameStrings::data->compiled_strings[0];
 }

src/game/game_text.hpp

@@ -66,6 +66,8 @@ struct GameStrings {
 	GameStrings(GameStrings &&) = delete;
 	GameStrings &operator=(const GameStrings &) = delete;
 	GameStrings &operator=(GameStrings &&) = delete;
+
+	static std::shared_ptr<GameStrings> data;
 };
 
 #endif /* GAME_TEXT_HPP */

src/saveload/game_sl.cpp

@@ -113,8 +113,6 @@ struct GSDTChunkHandler : ChunkHandler {
 	}
 };
 
-extern std::shared_ptr<GameStrings> _current_data;
-
 static std::string _game_saveload_string;
 static uint32_t _game_saveload_strings;
 
@@ -159,33 +157,33 @@ struct GSTRChunkHandler : ChunkHandler {
 	{
 		const std::vector<SaveLoad> slt = SlCompatTableHeader(_game_language_desc, _game_language_sl_compat);
 
-		_current_data = std::make_shared<GameStrings>();
+		GameStrings::data = std::make_shared<GameStrings>();
 
 		while (SlIterateArray() != -1) {
 			LanguageStrings ls;
 			SlObject(&ls, slt);
-			_current_data->raw_strings.push_back(std::move(ls));
+			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 (GameStrings::data->raw_strings.empty()) {
+			GameStrings::data.reset();
 			return;
 		}
 
-		_current_data->Compile();
+		GameStrings::data->Compile();
 		ReconsiderGameScriptLanguage();
 	}
 
 	void Save() const override
 	{
 		SlTableHeader(_game_language_desc);
 
-		if (_current_data == nullptr) return;
+		if (GameStrings::data == nullptr) return;
 
-		for (uint i = 0; i < _current_data->raw_strings.size(); i++) {
+		for (uint i = 0; i < GameStrings::data->raw_strings.size(); i++) {
 			SlSetArrayIndex(i);
-			SlObject(&_current_data->raw_strings[i], _game_language_desc);
+			SlObject(&GameStrings::data->raw_strings[i], _game_language_desc);
 		}
 	}
 };