From 5e4184d8c14134ea1529241452b2d059e36b5751 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Thu, 22 Feb 2024 02:49:59 +0530
Subject: [PATCH] Hopefully fix macos and windows compilation

---
 src/citymania/cm_overlays.cpp |  7 +++++--
 src/gfx.cpp                   | 25 ++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/citymania/cm_overlays.cpp b/src/citymania/cm_overlays.cpp
index 53b3cdd028..8d1b92631d 100644
--- a/src/citymania/cm_overlays.cpp
+++ b/src/citymania/cm_overlays.cpp
@@ -54,7 +54,8 @@ protected:
     int y = 0;
 
 public:
-	OverlayWindow() {}
+    OverlayWindow() {}
+	virtual ~OverlayWindow() {}
 
     void SetDirty() {
         this->dirty = true;
@@ -192,7 +193,7 @@ public:
             this->text_ofs_x = icon_dim.width + this->padding;
         return {
             text_dim.width + this->text_ofs_x,
-            data.size() * this->line_height - padding
+            (uint)data.size() * this->line_height - padding
         };
     }
 
@@ -225,6 +226,8 @@ class BuildInfoOverlay: public OverlayWindow {
 	BuildInfoOverlayData data;
     IconTextAligner aligner;
 public:
+    ~BuildInfoOverlay() override {}
+
 	void Show(int x, int y, BuildInfoOverlayData data) {
 		this->x = x;
 		this->y = y;
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 15d78ca500..982ad12130 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -972,8 +972,31 @@ static BlitterMode GetBlitterMode(PaletteID pal)
 		case PAL_NONE:          return BM_NORMAL;
 		case PALETTE_CRASH:     return BM_CRASH_REMAP;
 		case PALETTE_ALL_BLACK: return BM_BLACK_REMAP;
-		case CM_PALETTE_TINT_BASE ... (CM_PALETTE_TINT_BASE + CM_PALETTE_TINT_COUNT - 1):
+
+		case CM_PALETTE_TINT_RED_DEEP:
+		case CM_PALETTE_TINT_ORANGE_DEEP:
+		case CM_PALETTE_TINT_GREEN_DEEP:
+		case CM_PALETTE_TINT_CYAN_DEEP:
+		case CM_PALETTE_TINT_RED:
+		case CM_PALETTE_TINT_ORANGE:
+		case CM_PALETTE_TINT_YELLOW:
+		case CM_PALETTE_TINT_YELLOW_WHITE:
+		case CM_PALETTE_TINT_WHITE:
+		case CM_PALETTE_TINT_GREEN:
+		case CM_PALETTE_TINT_CYAN:
+		case CM_PALETTE_TINT_CYAN_WHITE:
+		case CM_PALETTE_TINT_BLUE:
+		case CM_PALETTE_SHADE_N:
+		case CM_PALETTE_SHADE_NE:
+		case CM_PALETTE_SHADE_E:
+		case CM_PALETTE_SHADE_SE:
+		case CM_PALETTE_SHADE_S:
+		case CM_PALETTE_SHADE_SW:
+		case CM_PALETTE_SHADE_W:
+		case CM_PALETTE_SHADE_NW:
+		case CM_PALETTE_TINT_COUNT:
 			return CM_BM_TINT_REMAP;
+
 		default:                return BM_COLOUR_REMAP;
 	}
 }