From 3b6867243b81b9ef68d11a3d76abac96a4e6e0cd Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 6 Jul 2020 12:46:46 -0700 Subject: [PATCH] Remove useless attribute rcol from finalclass The rcol of finalclass is always 6, so there's no reason to have an attribute there as if you could change it or anything. --- desktop_version/src/Finalclass.cpp | 2 -- desktop_version/src/Finalclass.h | 1 - desktop_version/src/Map.cpp | 1 - 3 files changed, 4 deletions(-) diff --git a/desktop_version/src/Finalclass.cpp b/desktop_version/src/Finalclass.cpp index bc3a2ab2..c51a6de7 100644 --- a/desktop_version/src/Finalclass.cpp +++ b/desktop_version/src/Finalclass.cpp @@ -8,7 +8,6 @@ const int* finalclass::loadlevel(int rx, int ry) t = rx + (ry * 100); const int* result; - rcol = 0; warpx = false; warpy = false; @@ -1410,7 +1409,6 @@ const int* finalclass::loadlevel(int rx, int ry) 98,98,220,218,98,98,98,98,98,98,98,98,98,98,98,98,98,220,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, }; - rcol = 6; warpy = true; roomname = "Temporary Fault..."; result = contents; diff --git a/desktop_version/src/Finalclass.h b/desktop_version/src/Finalclass.h index a8db7338..17baa750 100644 --- a/desktop_version/src/Finalclass.h +++ b/desktop_version/src/Finalclass.h @@ -12,7 +12,6 @@ public: const int* loadlevel(int rx, int ry); std::string roomname; - int rcol; bool warpx, warpy; }; diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index 9d729450..fb1c2c2a 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -1406,7 +1406,6 @@ void mapclass::loadlevel(int rx, int ry) roomname = finallevel.roomname; tileset = 1; background = 3; - graphics.rcol = finallevel.rcol; graphics.backgrounddrawn = false; if (finalstretch)