From faa443d9e752b24b34a5adf5abfc3593f913f5b4 Mon Sep 17 00:00:00 2001 From: dP Date: Fri, 1 Nov 2019 20:11:43 +0300 Subject: [PATCH] Fix some warnings --- src/industry_gui.cpp | 2 +- src/misc_gui.cpp | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 5c01a466d7..0d5d1765a4 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -1405,7 +1405,7 @@ protected: { for (IndustryType indt = 0; indt < NUM_INDUSTRYTYPES; ++indt) this->type_filter[indt] = true; - IndustryDirectoryWindow::initialized = true; + IndustryDirectoryWindow::initialized = true; } public: diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 473a92ee5d..9fb6e68b67 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1694,11 +1694,11 @@ public: uint waitunits = ge->max_waiting_cargo; int waitunits_stage = 0; - (ge->max_waiting_cargo > 1500) || - (waitunits_stage = 1, ge->max_waiting_cargo > 1000) || - (waitunits_stage = 2, ge->max_waiting_cargo > 600) || - (waitunits_stage = 3, ge->max_waiting_cargo > 300) || - (waitunits_stage = 4, ge->max_waiting_cargo > 100) || + (waitunits > 1500) || + (waitunits_stage = 1, waitunits > 1000) || + (waitunits_stage = 2, waitunits > 600) || + (waitunits_stage = 3, waitunits > 300) || + (waitunits_stage = 4, waitunits > 100) || (waitunits_stage = 5, true); total_rating += STATION_RATING_WAITUNITS[waitunits_stage]; @@ -1769,11 +1769,6 @@ public: virtual void DrawWidget(const Rect &r, int widget) const { - uint icon_size = ScaleGUITrad(10); - uint line_height = max((uint)FONT_HEIGHT_NORMAL, icon_size) + 2; - uint text_ofs = (line_height - FONT_HEIGHT_NORMAL) >> 1; - uint icon_ofs = (line_height - icon_size) >> 1; - GfxDrawLine(r.left, r.top, r.right, r.top, PC_BLACK); GfxDrawLine(r.left, r.bottom, r.right, r.bottom, PC_BLACK); GfxDrawLine(r.left, r.top, r.left, r.bottom, PC_BLACK);