summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-06-22 18:43:11 +0000
committertruelight <truelight@openttd.org>2007-06-22 18:43:11 +0000
commitcc533d77e51f1416ffd41d3b36e4fc76a84c3185 (patch)
tree250d35ac85c79e978d31b40c79b96db9e812c66e /src
parentf80fa33cc5f45bc74c10324fdec598c9486cf44b (diff)
downloadopenttd-cc533d77e51f1416ffd41d3b36e4fc76a84c3185.tar.xz
(svn r10271) -Fix r9563: move the Transparency Option menu item to the place it should have been in the first place: Option Menu, not Map Menu (go figure :p)
Diffstat (limited to 'src')
-rw-r--r--src/lang/english.txt2
-rw-r--r--src/main_gui.cpp40
2 files changed, 21 insertions, 21 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt
index a176c5125..8c366ed9a 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -778,6 +778,7 @@ STR_02C3_GAME_OPTIONS :Game options
STR_02C5_DIFFICULTY_SETTINGS :Difficulty settings
STR_02C7_CONFIG_PATCHES :Configure patches
STR_NEWGRF_SETTINGS :NewGRF settings
+STR_TRANSPARENCY_OPTIONS :Transparency options
STR_GAMEOPTMENU_0A :
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Town names displayed
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Station names displayed
@@ -805,7 +806,6 @@ STR_02DD_SUBSIDIES :Subsidies
STR_02DE_MAP_OF_WORLD :Map of world
STR_EXTRA_VIEW_PORT :Extra viewport
STR_SIGN_LIST :Sign list
-STR_TRANSPARENCY_OPTIONS :Transparency options
STR_02DF_TOWN_DIRECTORY :Town directory
STR_TOWN_POPULATION :{BLACK}World population: {COMMA}
STR_EXTRA_VIEW_PORT_TITLE :{WHITE}Viewport {COMMA}
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 0d923b600..dbdc8aa2d 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -179,15 +179,16 @@ static void MenuClickSettings(int index)
case 1: ShowGameDifficulty(); return;
case 2: ShowPatchesSelection(); return;
case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return;
-
- case 5: TOGGLEBIT(_display_opt, DO_SHOW_TOWN_NAMES); break;
- case 6: TOGGLEBIT(_display_opt, DO_SHOW_STATION_NAMES); break;
- case 7: TOGGLEBIT(_display_opt, DO_SHOW_SIGNS); break;
- case 8: TOGGLEBIT(_display_opt, DO_WAYPOINTS); break;
- case 9: TOGGLEBIT(_display_opt, DO_FULL_ANIMATION); break;
- case 10: TOGGLEBIT(_display_opt, DO_FULL_DETAIL); break;
- case 11: ToggleTransparency(); break;
- case 12: TOGGLEBIT(_transparent_opt, TO_SIGNS); break;
+ case 4: ShowTransparencyToolbar(); break;
+
+ case 6: TOGGLEBIT(_display_opt, DO_SHOW_TOWN_NAMES); break;
+ case 7: TOGGLEBIT(_display_opt, DO_SHOW_STATION_NAMES); break;
+ case 8: TOGGLEBIT(_display_opt, DO_SHOW_SIGNS); break;
+ case 9: TOGGLEBIT(_display_opt, DO_WAYPOINTS); break;
+ case 10: TOGGLEBIT(_display_opt, DO_FULL_ANIMATION); break;
+ case 11: TOGGLEBIT(_display_opt, DO_FULL_DETAIL); break;
+ case 12: ToggleTransparency(); break;
+ case 13: TOGGLEBIT(_transparent_opt, TO_SIGNS); break;
}
MarkWholeScreenDirty();
}
@@ -218,7 +219,6 @@ static void MenuClickMap(int index)
case 0: ShowSmallMap(); break;
case 1: ShowExtraViewPortWindow(); break;
case 2: ShowSignList(); break;
- case 3: ShowTransparencyToolbar(); break;
}
}
@@ -791,7 +791,7 @@ static void ToolbarSaveClick(Window *w)
static void ToolbarMapClick(Window *w)
{
- PopupMainToolbMenu(w, 4, STR_02DE_MAP_OF_WORLD, 4, 0);
+ PopupMainToolbMenu(w, 4, STR_02DE_MAP_OF_WORLD, 3, 0);
}
static void ToolbarTownClick(Window *w)
@@ -988,16 +988,16 @@ static void ToolbarOptionsClick(Window *w)
{
uint16 x = 0;
- w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 13, 0);
+ w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 14, 0);
- if (HASBIT(_display_opt, DO_SHOW_TOWN_NAMES)) SETBIT(x, 5);
- if (HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) SETBIT(x, 6);
- if (HASBIT(_display_opt, DO_SHOW_SIGNS)) SETBIT(x, 7);
- if (HASBIT(_display_opt, DO_WAYPOINTS)) SETBIT(x, 8);
- if (HASBIT(_display_opt, DO_FULL_ANIMATION)) SETBIT(x, 9);
- if (HASBIT(_display_opt, DO_FULL_DETAIL)) SETBIT(x, 10);
- if (GB(_transparent_opt, 1, 7) != 0) SETBIT(x, 11);
- if (HASBIT(_transparent_opt, TO_SIGNS)) SETBIT(x, 12);
+ if (HASBIT(_display_opt, DO_SHOW_TOWN_NAMES)) SETBIT(x, 6);
+ if (HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) SETBIT(x, 7);
+ if (HASBIT(_display_opt, DO_SHOW_SIGNS)) SETBIT(x, 8);
+ if (HASBIT(_display_opt, DO_WAYPOINTS)) SETBIT(x, 9);
+ if (HASBIT(_display_opt, DO_FULL_ANIMATION)) SETBIT(x, 10);
+ if (HASBIT(_display_opt, DO_FULL_DETAIL)) SETBIT(x, 11);
+ if (GB(_transparent_opt, 1, 7) != 0) SETBIT(x, 12);
+ if (HASBIT(_transparent_opt, TO_SIGNS)) SETBIT(x, 13);
WP(w,menu_d).checked_items = x;
}