Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r10036) -Add: sort the strings in town names dropdown

Browse Source
This commit is contained in:
glx 2007-06-04 19:51:31 +00:00
parent 59cb4da628
commit 62524492d5
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/settings_gui.cpp
View File

@ -66,6 +66,21 @@ static StringID *BuildDynamicDropdown(StringID base, int num)
return buf; return buf;
} }
static StringID _town_names[SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 2] = {STR_NULL};
void SortTownGeneratorNames()
{
int nb_town_names = SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1;
/* Init the strings */
if (_town_names[0] == STR_NULL) {
for (int i = 0; i < nb_town_names; i++) _town_names[i] = STR_TOWNNAME_ORIGINAL_ENGLISH + i;
_town_names[nb_town_names] = INVALID_STRING_ID;
}
/* Sort the strings */
qsort(&_town_names[0], nb_town_names, sizeof(StringID), &StringIDSorter);
}
static int GetCurRes() static int GetCurRes()
{ {
int i; int i;
@ -136,8 +151,14 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e)
ShowDropDownMenu(w, _driveside_dropdown, _opt_ptr->road_side, 11, i, 0); ShowDropDownMenu(w, _driveside_dropdown, _opt_ptr->road_side, 11, i, 0);
} return; } return;
case 13: case 14: { /* Setup townname dropdown */ case 13: case 14: { /* Setup townname dropdown */
int i = _opt_ptr->town_name; uint sel;
ShowDropDownMenu(w, BuildDynamicDropdown(STR_TOWNNAME_ORIGINAL_ENGLISH, SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1), i, 14, (_game_mode == GM_MENU) ? 0 : (-1) ^ (1 << i), 0); for (uint i = 0; i < lengthof(_town_names) - 1; i++) {
if (_town_names[i] == STR_TOWNNAME_ORIGINAL_ENGLISH + _opt_ptr->town_name) {
sel = i;
break;
}
}
ShowDropDownMenu(w, _town_names, sel, 14, (_game_mode == GM_MENU) ? 0 : (-1) ^ (1 << sel), 0);
return; return;
} }
case 16: case 17: /* Setup autosave dropdown */ case 16: case 17: /* Setup autosave dropdown */
@ -193,7 +214,7 @@ static void GameOptionsWndProc(Window *w, WindowEvent *e)
break; break;
case 14: /* Town names */ case 14: /* Town names */
if (_game_mode == GM_MENU) { if (_game_mode == GM_MENU) {
_opt_ptr->town_name = e->we.dropdown.index; _opt_ptr->town_name = _town_names[e->we.dropdown.index] - STR_TOWNNAME_ORIGINAL_ENGLISH;
InvalidateWindow(WC_GAME_OPTIONS, 0); InvalidateWindow(WC_GAME_OPTIONS, 0);
} }
break; break;

2
src/strings.cpp
View File

@ -1102,6 +1102,7 @@ StringID RemapOldStringID(StringID s)
} }
extern void SortNetworkLanguages(); extern void SortNetworkLanguages();
extern void SortTownGeneratorNames();
bool ReadLanguagePack(int lang_index) bool ReadLanguagePack(int lang_index)
{ {
@ -1159,6 +1160,7 @@ bool ReadLanguagePack(int lang_index)
_dynlang.curr = lang_index; _dynlang.curr = lang_index;
SetCurrentGrfLangID(_langpack->isocode); SetCurrentGrfLangID(_langpack->isocode);
SortNetworkLanguages(); SortNetworkLanguages();
SortTownGeneratorNames();
return true; return true;
} }