diff options
| -rw-r--r-- | src/aircraft_gui.cpp | 2 | ||||
| -rw-r--r-- | src/cheat_gui.cpp | 2 | ||||
| -rw-r--r-- | src/network/network_gui.cpp | 2 | ||||
| -rw-r--r-- | src/roadveh_gui.cpp | 2 | ||||
| -rw-r--r-- | src/settings_gui.cpp | 6 | ||||
| -rw-r--r-- | src/ship_gui.cpp | 2 | ||||
| -rw-r--r-- | src/train_gui.cpp | 2 | ||||
| -rw-r--r-- | src/widget.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/aircraft_gui.cpp b/src/aircraft_gui.cpp index 9787032fc..e17e29a25 100644 --- a/src/aircraft_gui.cpp +++ b/src/aircraft_gui.cpp @@ -72,7 +72,7 @@ void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection) DrawSprite(rotor_sprite, PAL_NONE, x + 25, y + 5); } if (v->index == selection) { - DrawFrameRect(x - 1, y - 1, x + 58, y + 21, 0xF, FR_BORDERONLY); + DrawFrameRect(x - 1, y - 1, x + 58, y + 21, COLOUR_WHITE, FR_BORDERONLY); } } diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp index f42eadc54..c5d84a141 100644 --- a/src/cheat_gui.cpp +++ b/src/cheat_gui.cpp @@ -148,7 +148,7 @@ struct CheatWindow : Window { case SLE_BOOL: { bool on = (*(bool*)ce->variable); - DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, on ? 6 : 4, on ? FR_LOWERED : FR_NONE); + DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, on ? COLOUR_GREEN : COLOUR_RED, on ? FR_LOWERED : FR_NONE); SetDParam(0, on ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF); } break; diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index fef126e6f..e066ce832 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1691,7 +1691,7 @@ struct NetworkJoinStatusWindow : Window { } /* Draw nice progress bar :) */ - DrawFrameRect(20, 18, (int)((this->width - 20) * progress / 100), 28, 10, FR_NONE); + DrawFrameRect(20, 18, (int)((this->width - 20) * progress / 100), 28, COLOUR_MAUVE, FR_NONE); } virtual void OnClick(Point pt, int widget) diff --git a/src/roadveh_gui.cpp b/src/roadveh_gui.cpp index 9c2c26b8b..c9190008b 100644 --- a/src/roadveh_gui.cpp +++ b/src/roadveh_gui.cpp @@ -132,7 +132,7 @@ void DrawRoadVehImage(const Vehicle *v, int x, int y, VehicleID selection, int c } if (highlight_w != 0) { - DrawFrameRect(x - 1, y - 1, x - 1 + highlight_w, y + 12, 15, FR_BORDERONLY); + DrawFrameRect(x - 1, y - 1, x - 1 + highlight_w, y + 12, COLOUR_WHITE, FR_BORDERONLY); } } diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 71345d0ee..6ebc6e8a6 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -1056,19 +1056,19 @@ struct CustomCurrencyWindow : Window { y += 12; /* separator */ - DrawFrameRect(10, y + 1, 29, y + 9, 0, GB(this->click, 2, 2) ? FR_LOWERED : FR_NONE); + DrawFrameRect(10, y + 1, 29, y + 9, COLOUR_DARK_BLUE, GB(this->click, 2, 2) ? FR_LOWERED : FR_NONE); x = DrawString(35, y + 1, STR_CURRENCY_SEPARATOR, TC_FROMSTRING); DoDrawString(this->separator, x + 4, y + 1, TC_ORANGE); y += 12; /* prefix */ - DrawFrameRect(10, y + 1, 29, y + 9, 0, GB(this->click, 4, 2) ? FR_LOWERED : FR_NONE); + DrawFrameRect(10, y + 1, 29, y + 9, COLOUR_DARK_BLUE, GB(this->click, 4, 2) ? FR_LOWERED : FR_NONE); x = DrawString(35, y + 1, STR_CURRENCY_PREFIX, TC_FROMSTRING); DoDrawString(_custom_currency.prefix, x + 4, y + 1, TC_ORANGE); y += 12; /* suffix */ - DrawFrameRect(10, y + 1, 29, y + 9, 0, GB(this->click, 6, 2) ? FR_LOWERED : FR_NONE); + DrawFrameRect(10, y + 1, 29, y + 9, COLOUR_DARK_BLUE, GB(this->click, 6, 2) ? FR_LOWERED : FR_NONE); x = DrawString(35, y + 1, STR_CURRENCY_SUFFIX, TC_FROMSTRING); DoDrawString(_custom_currency.suffix, x + 4, y + 1, TC_ORANGE); y += 12; diff --git a/src/ship_gui.cpp b/src/ship_gui.cpp index 52689f575..2a57c3aeb 100644 --- a/src/ship_gui.cpp +++ b/src/ship_gui.cpp @@ -24,7 +24,7 @@ void DrawShipImage(const Vehicle *v, int x, int y, VehicleID selection) DrawSprite(v->GetImage(DIR_W), GetVehiclePalette(v), x + 32, y + 10); if (v->index == selection) { - DrawFrameRect(x - 5, y - 1, x + 67, y + 21, 15, FR_BORDERONLY); + DrawFrameRect(x - 5, y - 1, x + 67, y + 21, COLOUR_WHITE, FR_BORDERONLY); } } diff --git a/src/train_gui.cpp b/src/train_gui.cpp index 9d528d8a6..715263a13 100644 --- a/src/train_gui.cpp +++ b/src/train_gui.cpp @@ -109,7 +109,7 @@ void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int cou if (highlight_l != highlight_r) { /* Draw the highlight. Now done after drawing all the engines, as * the next engine after the highlight could overlap it. */ - DrawFrameRect(highlight_l, 0, highlight_r, 13, 15, FR_BORDERONLY); + DrawFrameRect(highlight_l, 0, highlight_r, 13, COLOUR_WHITE, FR_BORDERONLY); } _cur_dpi = old_dpi; diff --git a/src/widget.cpp b/src/widget.cpp index 8c1abda6f..47e6f7097 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -496,7 +496,7 @@ void Window::DrawWidgets() const if (this->flags4 & WF_WHITE_BORDER_MASK) { - DrawFrameRect(0, 0, this->width - 1, this->height - 1, 0xF, FR_BORDERONLY); + DrawFrameRect(0, 0, this->width - 1, this->height - 1, COLOUR_WHITE, FR_BORDERONLY); } } |