summaryrefslogtreecommitdiff
path: root/main_gui.c
diff options
context:
space:
mode:
authordarkvater <darkvater@openttd.org>2005-01-15 00:42:01 +0000
committerdarkvater <darkvater@openttd.org>2005-01-15 00:42:01 +0000
commitc3a40dba6882c83d35db0d6b0c71060f4c0c62d9 (patch)
treea9d60db4553fd3151cb116692af51067708b3c1e /main_gui.c
parent976ed5e39684508f77f3e86c9f0a792d63b9e8e0 (diff)
downloadopenttd-c3a40dba6882c83d35db0d6b0c71060f4c0c62d9.tar.xz
(svn r1515) -Removed the 'close ALL windows' from the toolbar since shift+del does this.
Diffstat (limited to 'main_gui.c')
-rw-r--r--main_gui.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/main_gui.c b/main_gui.c
index 4098e2f1f..df77dddfc 100644
--- a/main_gui.c
+++ b/main_gui.c
@@ -167,14 +167,13 @@ static void MenuClickSettings(int index)
case 2: ShowPatchesSelection(); return;
case 3: ShowNewgrf(); return;
- case 5: DeleteAllNonVitalWindows(); return;
- case 6: _display_opt ^= DO_SHOW_TOWN_NAMES; MarkWholeScreenDirty(); return;
- case 7: _display_opt ^= DO_SHOW_STATION_NAMES; MarkWholeScreenDirty(); return;
- case 8: _display_opt ^= DO_SHOW_SIGNS; MarkWholeScreenDirty(); return;
- case 9: _display_opt ^= DO_WAYPOINTS; MarkWholeScreenDirty(); return;
- case 10: _display_opt ^= DO_FULL_ANIMATION; MarkWholeScreenDirty(); return;
- case 11: _display_opt ^= DO_FULL_DETAIL; MarkWholeScreenDirty(); return;
- case 12: _display_opt ^= DO_TRANS_BUILDINGS; MarkWholeScreenDirty(); return;
+ case 5: _display_opt ^= DO_SHOW_TOWN_NAMES; MarkWholeScreenDirty(); return;
+ case 6: _display_opt ^= DO_SHOW_STATION_NAMES; MarkWholeScreenDirty(); return;
+ case 7: _display_opt ^= DO_SHOW_SIGNS; MarkWholeScreenDirty(); return;
+ case 8: _display_opt ^= DO_WAYPOINTS; MarkWholeScreenDirty(); return;
+ case 9: _display_opt ^= DO_FULL_ANIMATION; MarkWholeScreenDirty(); return;
+ case 10: _display_opt ^= DO_FULL_DETAIL; MarkWholeScreenDirty(); return;
+ case 11: _display_opt ^= DO_TRANS_BUILDINGS; MarkWholeScreenDirty(); return;
}
}
@@ -975,16 +974,16 @@ static void ToolbarOptionsClick(Window *w)
{
uint16 x;
- w = PopupMainToolbMenu(w, 43, 2, STR_02C3_GAME_OPTIONS, 13);
+ w = PopupMainToolbMenu(w, 43, 2, STR_02C3_GAME_OPTIONS, 12);
x = (uint16)-1;
- if (_display_opt & DO_SHOW_TOWN_NAMES) x &= ~(1<<6);
- if (_display_opt & DO_SHOW_STATION_NAMES) x &= ~(1<<7);
- if (_display_opt & DO_SHOW_SIGNS) x &= ~(1<<8);
- if (_display_opt & DO_WAYPOINTS) x &= ~(1<<9);
- if (_display_opt & DO_FULL_ANIMATION) x &= ~(1<<10);
- if (_display_opt & DO_FULL_DETAIL) x &= ~(1<<11);
- if (_display_opt & DO_TRANS_BUILDINGS) x &= ~(1<<12);
+ if (_display_opt & DO_SHOW_TOWN_NAMES) x &= ~(1<<5);
+ if (_display_opt & DO_SHOW_STATION_NAMES) x &= ~(1<<6);
+ if (_display_opt & DO_SHOW_SIGNS) x &= ~(1<<7);
+ if (_display_opt & DO_WAYPOINTS) x &= ~(1<<8);
+ if (_display_opt & DO_FULL_ANIMATION) x &= ~(1<<9);
+ if (_display_opt & DO_FULL_DETAIL) x &= ~(1<<10);
+ if (_display_opt & DO_TRANS_BUILDINGS) x &= ~(1<<11);
WP(w,menu_d).checked_items = x;
}