diff options
| author | peter1138 <peter1138@openttd.org> | 2007-05-07 11:24:23 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-05-07 11:24:23 +0000 |
| commit | 0de85b7eb0375f3b857c10fc172f3894a906d758 (patch) | |
| tree | 45872079a8d4c2bb43978e42bafd845484977201 /src/main_gui.cpp | |
| parent | 76ee6d1c8295c55ad7af89e43cbf5012847aba0f (diff) | |
| download | openttd-0de85b7eb0375f3b857c10fc172f3894a906d758.tar.xz | |
(svn r9805) -Codechange: Use HASBIT() et al for display options bits.
Diffstat (limited to 'src/main_gui.cpp')
| -rw-r--r-- | src/main_gui.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp index bfc470b6a..d6be058fd 100644 --- a/src/main_gui.cpp +++ b/src/main_gui.cpp @@ -171,12 +171,12 @@ static void MenuClickSettings(int index) case 2: ShowPatchesSelection(); return; case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return; - case 5: _display_opt ^= DO_SHOW_TOWN_NAMES; break; - case 6: _display_opt ^= DO_SHOW_STATION_NAMES; break; - case 7: _display_opt ^= DO_SHOW_SIGNS; break; - case 8: _display_opt ^= DO_WAYPOINTS; break; - case 9: _display_opt ^= DO_FULL_ANIMATION; break; - case 10: _display_opt ^= DO_FULL_DETAIL; break; + 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; } @@ -974,12 +974,12 @@ static void ToolbarOptionsClick(Window *w) w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 13, 0); - if (_display_opt & DO_SHOW_TOWN_NAMES) SETBIT(x, 5); - if (_display_opt & DO_SHOW_STATION_NAMES) SETBIT(x, 6); - if (_display_opt & DO_SHOW_SIGNS) SETBIT(x, 7); - if (_display_opt & DO_WAYPOINTS) SETBIT(x, 8); - if (_display_opt & DO_FULL_ANIMATION) SETBIT(x, 9); - if (_display_opt & DO_FULL_DETAIL) SETBIT(x, 10); + 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); WP(w,menu_d).checked_items = x; |