From 22286bd7b6ece453e449f9b9f9f360484925457c Mon Sep 17 00:00:00 2001 From: frosch Date: Wed, 4 May 2011 17:45:16 +0000 Subject: (svn r22421) -Fix: Replace various references to Windows palette greyscale indices with the DOS palette indices. --- src/network/network_content_gui.cpp | 2 +- src/network/network_gui.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/network') diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index 13e0b5d59..7fb289368 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -452,7 +452,7 @@ public: for (ConstContentIterator iter = this->content.Get(this->vscroll->GetPosition()); iter != this->content.End() && cnt < this->vscroll->GetCapacity(); iter++, cnt++) { const ContentInfo *ci = *iter; - if (ci == this->selected) GfxFillRect(r.left + 1, y + 1, r.right - 1, y + this->resize.step_height - 1, 10); + if (ci == this->selected) GfxFillRect(r.left + 1, y + 1, r.right - 1, y + this->resize.step_height - 1, GREY_SCALE(10)); SpriteID sprite; SpriteID pal = PAL_NONE; diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 164f601bd..a5ef1ac83 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -382,7 +382,7 @@ protected: const NWidgetBase *nwi_info = this->GetWidget(NGWW_INFO); /* show highlighted item with a different colour */ - if (highlight) GfxFillRect(nwi_name->pos_x + 1, y - 2, nwi_info->pos_x + nwi_info->current_x - 2, y + FONT_HEIGHT_NORMAL - 1, 10); + if (highlight) GfxFillRect(nwi_name->pos_x + 1, y - 2, nwi_info->pos_x + nwi_info->current_x - 2, y + FONT_HEIGHT_NORMAL - 1, GREY_SCALE(10)); DrawString(nwi_name->pos_x + WD_FRAMERECT_LEFT, nwi_name->pos_x + nwi_name->current_x - WD_FRAMERECT_RIGHT, y, cur_item->info.server_name, TC_BLACK); @@ -1490,7 +1490,7 @@ struct NetworkLobbyWindow : public Window { byte company = NetworkLobbyFindCompanyIndex(pos); bool income = false; if (this->company == company) { - GfxFillRect(r.left + 1, y - 2, r.right - 1, y + FONT_HEIGHT_NORMAL, 10); // show highlighted item with a different colour + GfxFillRect(r.left + 1, y - 2, r.right - 1, y + FONT_HEIGHT_NORMAL, GREY_SCALE(10)); // show highlighted item with a different colour } DrawString(text_left, text_right, y, this->company_info[company].company_name, TC_BLACK); @@ -1826,7 +1826,7 @@ struct NetworkClientListPopupWindow : Window { for (const ClientListAction *action = this->actions.Begin(); action != this->actions.End(); action++, y += FONT_HEIGHT_NORMAL) { TextColour colour; if (sel-- == 0) { // Selected item, highlight it - GfxFillRect(r.left + 1, y, r.right - 1, y + FONT_HEIGHT_NORMAL - 1, 0); + GfxFillRect(r.left + 1, y, r.right - 1, y + FONT_HEIGHT_NORMAL - 1, GREY_SCALE(0)); colour = TC_WHITE; } else { colour = TC_BLACK; @@ -1978,7 +1978,7 @@ struct NetworkClientListWindow : Window { FOR_ALL_CLIENT_INFOS(ci) { TextColour colour; if (this->selected_item == i++) { // Selected item, highlight it - GfxFillRect(r.left + 1, y, r.right - 1, y + FONT_HEIGHT_NORMAL - 1, 0); + GfxFillRect(r.left + 1, y, r.right - 1, y + FONT_HEIGHT_NORMAL - 1, GREY_SCALE(0)); colour = TC_WHITE; } else { colour = TC_BLACK; -- cgit v1.2.3-54-g00ecf