mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 06:23:04 +01:00
Code Issues Releases Wiki Activity

Refactor/Improve String and Path Handling

Browse Source
This commit is contained in:
LRFLEW
2016-09-25 21:24:29 -05:00
parent 211a0d7863
commit e5ff7412e4
94 changed files with 1038 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/localisation/language.cpp
View File

@@ -148,7 +148,6 @@ const char *language_get_string(rct_string_id id)
bool language_open(int id)
{
static const char *languagePath = "%s/language/%s.txt";
char filename[MAX_PATH];
char dataPath[MAX_PATH];
@@ -156,13 +155,19 @@ bool language_open(int id)
if (id == LANGUAGE_UNDEFINED)
return false;
platform_get_openrct_data_path(dataPath);
platform_get_openrct_data_path(dataPath, sizeof(dataPath));
if (id != LANGUAGE_ENGLISH_UK) {
sprintf(filename, languagePath, dataPath, LanguagesDescriptors[LANGUAGE_ENGLISH_UK].locale);
safe_strcpy(filename, dataPath, MAX_PATH);
safe_strcat_path(filename, "language", MAX_PATH);
safe_strcat_path(filename, LanguagesDescriptors[LANGUAGE_ENGLISH_UK].locale, MAX_PATH);
path_append_extension(filename, ".txt", MAX_PATH);
_languageFallback = LanguagePackFactory::FromFile(LANGUAGE_ENGLISH_UK, filename);
}
sprintf(filename, languagePath, dataPath, LanguagesDescriptors[id].locale);
safe_strcpy(filename, dataPath, MAX_PATH);
safe_strcat_path(filename, "language", MAX_PATH);
safe_strcat_path(filename, LanguagesDescriptors[id].locale, MAX_PATH);
path_append_extension(filename, ".txt", MAX_PATH);
_languageCurrent = LanguagePackFactory::FromFile(id, filename);
if (_languageCurrent != nullptr) {
gCurrentLanguage = id;