mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r25074) -Cleanup: Simplify currency selection code slightly

This commit is contained in:
planetmaker 2013-03-09 16:23:22 +00:00
parent e808104b88
commit bd301e8475
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/settings_gui.cpp
View File

@ -190,23 +190,17 @@ struct GameOptionsWindow : Window {
*selected_index = this->opt->locale.currency;
StringID *items = BuildCurrencyDropdown();
uint disabled = _game_mode == GM_MENU ? 0 : ~GetMaskOfAllowedCurrencies();
int custom_index = -1;
/* Add non-custom currencies; sorted naturally */
for (uint i = 0; *items != INVALID_STRING_ID; items++, i++) {
if (*items == STR_GAME_OPTIONS_CURRENCY_CUSTOM) {
custom_index = i;
} else {
list->push_back(new DropDownListStringItem(*items, i, HasBit(disabled, i)));
}
for (uint i = 0; i < CURRENCY_END; items++, i++) {
if (i == CURRENCY_CUSTOM) continue;
list->push_back(new DropDownListStringItem(*items, i, HasBit(disabled, i)));
}
list->sort(DropDownListStringItem::NatSortFunc);
/* Append custom currency at the end */
if (custom_index >= 0) {
list->push_back(new DropDownListItem(-1, false)); // separator line
list->push_back(new DropDownListStringItem(STR_GAME_OPTIONS_CURRENCY_CUSTOM, custom_index, HasBit(disabled, custom_index)));
}
list->push_back(new DropDownListItem(-1, false)); // separator line
list->push_back(new DropDownListStringItem(STR_GAME_OPTIONS_CURRENCY_CUSTOM, CURRENCY_CUSTOM, HasBit(disabled, CURRENCY_CUSTOM)));
break;
}