Added get_map_language

Author: twist84

game/source/cseries/language.cpp

@@ -125,38 +125,44 @@ const char* get_language_display_name(e_language language)
 {
 	//return INVOKE(0x0052FDC0, get_language_display_name, language);
 
+	const char* result = "";
 	if (IN_RANGE(language, _language_invalid, k_language_count))
-		return k_language_names[language];
-
-	return "";
+	{
+		result = k_language_names[language];
+	}
+	return result;
 }
 
 e_language get_language_from_display_name_slow(const char* display_name)
 {
 	//return INVOKE(0x0052FE60, get_language_from_display_name_slow, display_name);
 
 	e_language language = k_language_default;
-
 	while (true)
 	{
 		if (csstricmp(display_name, get_language_display_name(language)) == 0)
+		{
 			break;
+		}
 
 		if (++language >= k_language_count)
+		{
 			return _language_invalid;
+		}
 	}
-
 	return language;
 }
 
 const char* __cdecl get_language_iso_639_1_name(e_language language)
 {
 	//return INVOKE(0x0052FF30, get_language_display_name, language);
 
-	if (language > _language_invalid && language < k_language_count)
-		return k_language_iso_639_1_names[language];
-
-	return "";
+	const char* result = "";
+	if (IN_RANGE(language, _language_invalid, k_language_count))
+	{
+		result = k_language_iso_639_1_names[language];
+	}
+	return result;
 }
 
 const char* __cdecl get_language_suffix(e_language language, bool english_is_empty)
@@ -169,7 +175,9 @@ const char* __cdecl get_language_suffix(e_language language, bool english_is_emp
 	case _language_english:
 	{
 		if (!english_is_empty)
+		{
 			result = "en";
+		}
 	}
 	break;
 	case _language_japanese:
@@ -228,7 +236,6 @@ const char* __cdecl get_language_suffix(e_language language, bool english_is_emp
 	}
 	break;
 	}
-
 	return result;
 }
 
@@ -268,5 +275,7 @@ void __cdecl set_current_language_from_display_name_slow(const char* display_nam
 
 	e_language language = get_language_from_display_name_slow(display_name);
 	if (language != _language_invalid)
+	{
 		set_current_language(language);
+	}
 }

game/source/game/game_globals.cpp

@@ -40,12 +40,24 @@ rgb_color const k_player_colors[]
 
 c_typed_tag_block<rgb_color> s_game_globals::profile_colors{};
 
+e_language get_map_language()
+{
+	e_language result = k_first_language;
+	if (global_scenario && VALID_INDEX(global_game_globals->language, k_language_count))
+	{
+		result = global_game_globals->language;
+	}
+	return result;
+}
+
 int32 get_map_minor_version()
 {
+	int32 result = NONE;
 	if (global_scenario)
-		return cache_files_get_header()->minor_version_number;
-	else
-		return NONE;
+	{
+		result = cache_files_get_header()->minor_version_number;
+	}
+	return result;
 }
 
 void s_game_globals::update_static_runtime_data()

game/source/game/game_globals.hpp

@@ -60,6 +60,7 @@ struct game_globals_storage
 };
 static_assert(sizeof(game_globals_storage) == 0x25208);
 
+extern e_language get_map_language();
 extern int32 get_map_minor_version();
 
 struct s_damage_globals_definition;
@@ -83,7 +84,7 @@ struct s_game_globals
 
 	int32 unused0[0x2B];
 
-	c_enum<e_language, int32, _language_invalid, k_language_count> language;
+	e_language language;
 	c_typed_tag_block<s_game_globals_havok_cleanup_resources> havok_cleanup_resources;
 	c_typed_tag_block<s_sound_globals_definition> sound_globals;