diff options
| author | rubidium <rubidium@openttd.org> | 2010-11-13 12:09:30 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-11-13 12:09:30 +0000 |
| commit | 8aba642ed5bbad969b56bf5b72834ad04599d296 (patch) | |
| tree | a7cb920bfa051da93215e0292065bdd1a6c459a2 /src/settings_gui.cpp | |
| parent | 68b94e61e03e8ff26c6e84ed99f2a1154ed0e638 (diff) | |
| download | openttd-8aba642ed5bbad969b56bf5b72834ad04599d296.tar.xz | |
(svn r21164) -Codechange: replace the hardcoded array of language metadata with a list
Diffstat (limited to 'src/settings_gui.cpp')
| -rw-r--r-- | src/settings_gui.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 24f73bd71..6d6881234 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -316,9 +316,9 @@ struct GameOptionsWindow : Window { /* Sort language names */ LangList langs; - int current_lang; - for (int i = 0; i < _dynlang.num; i++) { - if (&_dynlang.ent[i] == _current_language) current_lang = i; + int current_lang = 0; + for (size_t i = 0; i < _languages.Length(); i++) { + if (&_languages[i] == _current_language) current_lang = i; langs[SPECSTR_LANGUAGE_START + i] = i; } @@ -418,7 +418,7 @@ struct GameOptionsWindow : Window { break; case GOW_LANG_DROPDOWN: // Change interface language - ReadLanguagePack(&_dynlang.ent[index]); + ReadLanguagePack(&_languages[index]); CheckForMissingGlyphsInLoadedLanguagePack(); UpdateAllVirtCoords(); ReInitAllWindows(); @@ -495,7 +495,7 @@ static const NWidgetPart _nested_game_options_widgets[] = { NWidget(WWT_DROPDOWN, COLOUR_GREY, GOW_TOWNNAME_DROPDOWN), SetMinimalSize(150, 12), SetDataTip(STR_BLACK_STRING, STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP), SetFill(1, 0), EndContainer(), NWidget(WWT_FRAME, COLOUR_GREY), SetDataTip(STR_GAME_OPTIONS_LANGUAGE, STR_NULL), - NWidget(WWT_DROPDOWN, COLOUR_GREY, GOW_LANG_DROPDOWN), SetMinimalSize(150, 12), SetDataTip(STR_BLACK_STRING, STR_GAME_OPTIONS_LANGUAGE_TOOLTIP), SetFill(1, 0), + NWidget(WWT_DROPDOWN, COLOUR_GREY, GOW_LANG_DROPDOWN), SetMinimalSize(150, 12), SetDataTip(STR_BLACK_RAW_STRING, STR_GAME_OPTIONS_LANGUAGE_TOOLTIP), SetFill(1, 0), EndContainer(), NWidget(WWT_FRAME, COLOUR_GREY), SetDataTip(STR_GAME_OPTIONS_SCREENSHOT_FORMAT, STR_NULL), NWidget(WWT_DROPDOWN, COLOUR_GREY, GOW_SCREENSHOT_DROPDOWN), SetMinimalSize(150, 12), SetDataTip(STR_BLACK_STRING, STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP), SetFill(1, 0), |