mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9805) -Codechange: Use HASBIT() et al for display options bits.

release/0.6
peter1138 2007-05-07 11:24:23 +00:00
parent 76ee6d1c82
commit 0de85b7eb0
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main_gui.cpp
View File

@ -171,12 +171,12 @@ static void MenuClickSettings(int index)
case 2: ShowPatchesSelection(); return; case 2: ShowPatchesSelection(); return;
case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return; case 3: ShowNewGRFSettings(!_networking, true, true, &_grfconfig); return;
case 5: _display_opt ^= DO_SHOW_TOWN_NAMES; break; case 5: TOGGLEBIT(_display_opt, DO_SHOW_TOWN_NAMES); break;
case 6: _display_opt ^= DO_SHOW_STATION_NAMES; break; case 6: TOGGLEBIT(_display_opt, DO_SHOW_STATION_NAMES); break;
case 7: _display_opt ^= DO_SHOW_SIGNS; break; case 7: TOGGLEBIT(_display_opt, DO_SHOW_SIGNS); break;
case 8: _display_opt ^= DO_WAYPOINTS; break; case 8: TOGGLEBIT(_display_opt, DO_WAYPOINTS); break;
case 9: _display_opt ^= DO_FULL_ANIMATION; break; case 9: TOGGLEBIT(_display_opt, DO_FULL_ANIMATION); break;
case 10: _display_opt ^= DO_FULL_DETAIL; break; case 10: TOGGLEBIT(_display_opt, DO_FULL_DETAIL); break;
case 11: ToggleTransparency(); break; case 11: ToggleTransparency(); break;
case 12: TOGGLEBIT(_transparent_opt, TO_SIGNS); 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); w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 13, 0);
if (_display_opt & DO_SHOW_TOWN_NAMES) SETBIT(x, 5); if (HASBIT(_display_opt, DO_SHOW_TOWN_NAMES)) SETBIT(x, 5);
if (_display_opt & DO_SHOW_STATION_NAMES) SETBIT(x, 6); if (HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) SETBIT(x, 6);
if (_display_opt & DO_SHOW_SIGNS) SETBIT(x, 7); if (HASBIT(_display_opt, DO_SHOW_SIGNS)) SETBIT(x, 7);
if (_display_opt & DO_WAYPOINTS) SETBIT(x, 8); if (HASBIT(_display_opt, DO_WAYPOINTS)) SETBIT(x, 8);
if (_display_opt & DO_FULL_ANIMATION) SETBIT(x, 9); if (HASBIT(_display_opt, DO_FULL_ANIMATION)) SETBIT(x, 9);
if (_display_opt & DO_FULL_DETAIL) SETBIT(x, 10); if (HASBIT(_display_opt, DO_FULL_DETAIL)) SETBIT(x, 10);
if (GB(_transparent_opt, 1, 7) != 0) SETBIT(x, 11); if (GB(_transparent_opt, 1, 7) != 0) SETBIT(x, 11);
if (HASBIT(_transparent_opt, TO_SIGNS)) SETBIT(x, 12); if (HASBIT(_transparent_opt, TO_SIGNS)) SETBIT(x, 12);
WP(w,menu_d).checked_items = x; WP(w,menu_d).checked_items = x;

2
src/openttd.cpp
View File

@ -1076,7 +1076,7 @@ void GameLoop()
StateGameLoop(); StateGameLoop();
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
if (!_pause_game && _display_opt & DO_FULL_ANIMATION) DoPaletteAnimations(); if (!_pause_game && HASBIT(_display_opt, DO_FULL_ANIMATION)) DoPaletteAnimations();
if (!_pause_game || _cheats.build_in_pause.value) MoveAllTextEffects(); if (!_pause_game || _cheats.build_in_pause.value) MoveAllTextEffects();

12
src/openttd.h
View File

@ -171,12 +171,12 @@ struct TileInfo {
/* Display Options */ /* Display Options */
enum { enum {
DO_SHOW_TOWN_NAMES = 1 << 0, DO_SHOW_TOWN_NAMES = 0,
DO_SHOW_STATION_NAMES = 1 << 1, DO_SHOW_STATION_NAMES = 1,
DO_SHOW_SIGNS = 1 << 2, DO_SHOW_SIGNS = 2,
DO_FULL_ANIMATION = 1 << 3, DO_FULL_ANIMATION = 3,
DO_FULL_DETAIL = 1 << 5, DO_FULL_DETAIL = 5,
DO_WAYPOINTS = 1 << 6, DO_WAYPOINTS = 6,
}; };
enum { enum {

2
src/rail_cmd.cpp
View File

@ -1322,7 +1322,7 @@ static void DrawTile_Track(TileInfo *ti)
DrawTrackBits(ti, rails); DrawTrackBits(ti, rails);
if (_display_opt & DO_FULL_DETAIL) DrawTrackDetails(ti); if (HASBIT(_display_opt, DO_FULL_DETAIL)) DrawTrackDetails(ti);
if (HasSignals(ti->tile)) DrawSignals(ti->tile, rails); if (HasSignals(ti->tile)) DrawSignals(ti->tile, rails);
} else { } else {

2
src/road_cmd.cpp
View File

@ -725,7 +725,7 @@ static void DrawRoadBits(TileInfo* ti)
} }
/* Return if full detail is disabled, or we are zoomed fully out. */ /* Return if full detail is disabled, or we are zoomed fully out. */
if (!(_display_opt & DO_FULL_DETAIL) || _cur_dpi->zoom == 2) return; if (!HASBIT(_display_opt, DO_FULL_DETAIL) || _cur_dpi->zoom == 2) return;
/* Draw extra details. */ /* Draw extra details. */
for (drts = _road_display_table[roadside][road]; drts->image != 0; drts++) { for (drts = _road_display_table[roadside][road]; drts->image != 0; drts++) {

16
src/viewport.cpp
View File

@ -799,7 +799,7 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
Town *t; Town *t;
int left, top, right, bottom; int left, top, right, bottom;
if (!(_display_opt & DO_SHOW_TOWN_NAMES) || _game_mode == GM_MENU) if (!HASBIT(_display_opt, DO_SHOW_TOWN_NAMES) || _game_mode == GM_MENU)
return; return;
left = dpi->left; left = dpi->left;
@ -873,7 +873,7 @@ static void ViewportAddStationNames(DrawPixelInfo *dpi)
int left, top, right, bottom; int left, top, right, bottom;
const Station *st; const Station *st;
if (!(_display_opt & DO_SHOW_STATION_NAMES) || _game_mode == GM_MENU) if (!HASBIT(_display_opt, DO_SHOW_STATION_NAMES) || _game_mode == GM_MENU)
return; return;
left = dpi->left; left = dpi->left;
@ -940,7 +940,7 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
const Sign *si; const Sign *si;
int left, top, right, bottom; int left, top, right, bottom;
if (!(_display_opt & DO_SHOW_SIGNS)) if (!HASBIT(_display_opt, DO_SHOW_SIGNS))
return; return;
left = dpi->left; left = dpi->left;
@ -1007,7 +1007,7 @@ static void ViewportAddWaypoints(DrawPixelInfo *dpi)
const Waypoint *wp; const Waypoint *wp;
int left, top, right, bottom; int left, top, right, bottom;
if (!(_display_opt & DO_WAYPOINTS)) if (!HASBIT(_display_opt, DO_WAYPOINTS))
return; return;
left = dpi->left; left = dpi->left;
@ -1487,7 +1487,7 @@ static bool CheckClickOnTown(const ViewPort *vp, int x, int y)
{ {
const Town *t; const Town *t;
if (!(_display_opt & DO_SHOW_TOWN_NAMES)) return false; if (!HASBIT(_display_opt, DO_SHOW_TOWN_NAMES)) return false;
switch (vp->zoom) { switch (vp->zoom) {
case 0: case 0:
@ -1541,7 +1541,7 @@ static bool CheckClickOnStation(const ViewPort *vp, int x, int y)
{ {
const Station *st; const Station *st;
if (!(_display_opt & DO_SHOW_STATION_NAMES)) return false; if (!HASBIT(_display_opt, DO_SHOW_STATION_NAMES)) return false;
switch (vp->zoom) { switch (vp->zoom) {
case 0: case 0:
@ -1595,7 +1595,7 @@ static bool CheckClickOnSign(const ViewPort *vp, int x, int y)
{ {
const Sign *si; const Sign *si;
if (!(_display_opt & DO_SHOW_SIGNS) || _current_player == PLAYER_SPECTATOR) return false; if (!HASBIT(_display_opt, DO_SHOW_SIGNS) || _current_player == PLAYER_SPECTATOR) return false;
switch (vp->zoom) { switch (vp->zoom) {
case 0: case 0:
@ -1649,7 +1649,7 @@ static bool CheckClickOnWaypoint(const ViewPort *vp, int x, int y)
{ {
const Waypoint *wp; const Waypoint *wp;
if (!(_display_opt & DO_WAYPOINTS)) return false; if (!HASBIT(_display_opt, DO_WAYPOINTS)) return false;
switch (vp->zoom) { switch (vp->zoom) {
case 0: case 0: