summaryrefslogtreecommitdiff
path: root/src/main_gui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/main_gui.cpp')
-rw-r--r--src/main_gui.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 25387237f..02af27d71 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -454,10 +454,10 @@ static void MenuWndProc(Window *w, WindowEvent *e)
y = 1;
for (; count != 0; count--, string++, sel--) {
- TextColour color = HASBIT(dis, 0) ? TC_GREY : (sel == 0) ? TC_WHITE : TC_BLACK;
+ TextColour color = HasBit(dis, 0) ? TC_GREY : (sel == 0) ? TC_WHITE : TC_BLACK;
if (sel == 0) GfxFillRect(x, y, x + w->width - 3, y + 9, 0);
- if (HASBIT(chk, 0)) DrawString(x + 2, y, STR_CHECKMARK, color);
+ if (HasBit(chk, 0)) DrawString(x + 2, y, STR_CHECKMARK, color);
DrawString(x + 2, y, string, color);
y += 10;
@@ -971,12 +971,12 @@ static void ToolbarOptionsClick(Window *w)
w = PopupMainToolbMenu(w, 2, STR_02C3_GAME_OPTIONS, 14, 0);
- 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 (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 (IsTransparencySet(TO_HOUSES) && IsTransparencySet(TO_TREES)) SETBIT(x, 12);
if (IsTransparencySet(TO_SIGNS)) SETBIT(x, 13);
WP(w,menu_d).checked_items = x;