summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-07-25 11:02:15 +0000
committerrubidium <rubidium@openttd.org>2009-07-25 11:02:15 +0000
commit36a28fe3d2ea272c412bebf5a5620b9c06b61cf8 (patch)
tree25a8503ab3338f345f2246bb661bb3e6199c7614 /src
parent8e92d536d30dbb916064e67d14784bd72b36b079 (diff)
downloadopenttd-36a28fe3d2ea272c412bebf5a5620b9c06b61cf8.tar.xz
(svn r16951) -Change: order the strings in the options dropdown slightly more logical
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt2
-rw-r--r--src/toolbar_gui.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index d132a4071..588acc56a 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -678,8 +678,8 @@ STR_SETTINGS_MENU_NEWGRF_SETTINGS :NewGRF settings
STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS :Transparency options
STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED :{SETX 12}Town names displayed
STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED :{SETX 12}Station names displayed
+STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :{SETX 12}Waypoint names displayed
STR_SETTINGS_MENU_SIGNS_DISPLAYED :{SETX 12}Signs displayed
-STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED :{SETX 12}Waypoints displayed
STR_SETTINGS_MENU_FULL_ANIMATION :{SETX 12}Full animation
STR_SETTINGS_MENU_FULL_DETAIL :{SETX 12}Full detail
STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS :{SETX 12}Transparent buildings
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 2ccc8df83..a19f478a6 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -274,8 +274,8 @@ enum OptionMenuEntries {
OME_TRANSPARENCIES,
OME_SHOW_TOWNNAMES,
OME_SHOW_STATIONNAMES,
- OME_SHOW_SIGNS,
OME_SHOW_WAYPOINTNAMES,
+ OME_SHOW_SIGNS,
OME_FULL_ANIMATION,
OME_FULL_DETAILS,
OME_TRANSPARENTBUILDINGS,
@@ -293,8 +293,8 @@ static void ToolbarOptionsClick(Window *w)
list->push_back(new DropDownListItem(-1, false));
list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED, OME_SHOW_TOWNNAMES, false, HasBit(_display_opt, DO_SHOW_TOWN_NAMES)));
list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED, OME_SHOW_STATIONNAMES, false, HasBit(_display_opt, DO_SHOW_STATION_NAMES)));
- list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_SIGNS_DISPLAYED, OME_SHOW_SIGNS, false, HasBit(_display_opt, DO_SHOW_SIGNS)));
list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED, OME_SHOW_WAYPOINTNAMES, false, HasBit(_display_opt, DO_SHOW_WAYPOINT_NAMES)));
+ list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_SIGNS_DISPLAYED, OME_SHOW_SIGNS, false, HasBit(_display_opt, DO_SHOW_SIGNS)));
list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_FULL_ANIMATION, OME_FULL_ANIMATION, false, HasBit(_display_opt, DO_FULL_ANIMATION)));
list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_FULL_DETAIL, OME_FULL_DETAILS, false, HasBit(_display_opt, DO_FULL_DETAIL)));
list->push_back(new DropDownListCheckedItem(STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS, OME_TRANSPARENTBUILDINGS, false, IsTransparencySet(TO_HOUSES)));
@@ -315,8 +315,8 @@ static void MenuClickSettings(int index)
case OME_SHOW_TOWNNAMES: ToggleBit(_display_opt, DO_SHOW_TOWN_NAMES); break;
case OME_SHOW_STATIONNAMES: ToggleBit(_display_opt, DO_SHOW_STATION_NAMES); break;
- case OME_SHOW_SIGNS: ToggleBit(_display_opt, DO_SHOW_SIGNS); break;
case OME_SHOW_WAYPOINTNAMES: ToggleBit(_display_opt, DO_SHOW_WAYPOINT_NAMES); break;
+ case OME_SHOW_SIGNS: ToggleBit(_display_opt, DO_SHOW_SIGNS); break;
case OME_FULL_ANIMATION: ToggleBit(_display_opt, DO_FULL_ANIMATION); break;
case OME_FULL_DETAILS: ToggleBit(_display_opt, DO_FULL_DETAIL); break;
case OME_TRANSPARENTBUILDINGS: ToggleTransparency(TO_HOUSES); break;