From 06103cc4ca8e0fc0a0184fcc703ec9c29f07e6d1 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 2 Nov 2020 12:16:36 -0800 Subject: [PATCH] Remove now-unused function mapclass::RGB() This function was only used in assigments to mapclass::towercol. But that variable is unused, and has been removed, so after removing that variable, this one is unused, too. --- desktop_version/src/Map.cpp | 5 ----- desktop_version/src/Map.h | 2 -- 2 files changed, 7 deletions(-) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 0f6ab6f2..c8a044be 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -123,11 +123,6 @@ const int mapclass::areamap[] = { 2,2,2,2,2,0,0,2,0,3,0,0,0,0,0,0,0,0,0,0, }; -int mapclass::RGB(int red,int green,int blue) -{ - return (blue | (green << 8) | (red << 16)); -} - int mapclass::intpol(int a, int b, float c) { return static_cast(a + ((b - a) * c)); diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h index 963ed8b2..6f50e285 100644 --- a/desktop_version/src/Map.h +++ b/desktop_version/src/Map.h @@ -22,8 +22,6 @@ class mapclass public: mapclass(); - int RGB(int red,int green,int blue); - int intpol(int a, int b, float c); void setteleporter(int x, int y);