From 64c973ccc552cf85368a4cda3e7dc473ed70af47 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 5 Dec 2008 22:46:39 +0000 Subject: [PATCH] (svn r14658) -Change: allow changing town names when there are no towns in the scenario yet. --- src/settings_gui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index dc197374d1..b6e060ce14 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -134,7 +134,7 @@ static void ShowTownnameDropdown(Window *w, int sel) DropDownList *list = new DropDownList(); for (TownList::iterator it = townnames.begin(); it != townnames.end(); it++) { - list->push_back(new DropDownListStringItem((*it).first, (*it).second, !(_game_mode == GM_MENU || (*it).second == sel))); + list->push_back(new DropDownListStringItem((*it).first, (*it).second, !(_game_mode == GM_MENU || GetNumTowns() == 0 || (*it).second == sel))); } ShowDropDownList(w, list, sel, GAMEOPT_TOWNNAME_BTN); @@ -283,7 +283,7 @@ struct GameOptionsWindow : Window { break; case GAMEOPT_TOWNNAME_BTN: // Town names - if (_game_mode == GM_MENU) { + if (_game_mode == GM_MENU || GetNumTowns() == 0) { this->opt->game_creation.town_name = index; InvalidateWindow(WC_GAME_OPTIONS, 0); }