From 31ef1b951059a33bd8f9c346fcee560ebd08bf9e Mon Sep 17 00:00:00 2001 From: planetmaker Date: Sat, 9 Mar 2013 16:23:22 +0000 Subject: [PATCH] (svn r25074) -Cleanup: Simplify currency selection code slightly --- src/settings_gui.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index c7229430d0..50b0b880c0 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -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; }