From 524a535c62383efb1b43d65d7ae4fc379ef905a5 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Thu, 2 Jul 2020 19:20:22 -0700
Subject: [PATCH] Move temp and temp2 off of mapclass

There's no reason these temporary variables need to exist on the class
exist.
---
 desktop_version/src/Map.cpp | 8 ++++----
 desktop_version/src/Map.h   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 74b21d60..7d6644e3 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -529,7 +529,7 @@ void mapclass::changefinalcol(int t)
 	//change the map to colour t - for the game's final stretch.
 	//First up, the tiles. This is just a setting:
 	final_mapcol = t;
-	temp = 6 - t;
+	int temp = 6 - t;
 	//Next, entities
 	for (size_t i = 0; i < obj.entities.size(); i++)
 	{
@@ -1040,7 +1040,7 @@ void mapclass::gotoroom(int rx, int ry)
 		//Leaving the Ship
 		if (game.roomx == 104 && game.roomy == 112) music.niceplay(4);
 	}
-	temp = rx + (ry * 100);
+	int temp = rx + (ry * 100);
 	loadlevel(game.roomx, game.roomy);
 
 
@@ -1865,8 +1865,8 @@ void mapclass::loadlevel(int rx, int ry)
 			if (obj.entities[i].type == 1 && obj.entities[i].behave >= 8 && obj.entities[i].behave < 10)
 			{
 				//put a block underneath
-				temp = obj.entities[i].xp / 8.0f;
-				temp2 = obj.entities[i].yp / 8.0f;
+				int temp = obj.entities[i].xp / 8.0f;
+				int temp2 = obj.entities[i].yp / 8.0f;
 				settile(temp, temp2, 1);
 				settile(temp+1, temp2, 1);
 				settile(temp+2, temp2, 1);
diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h
index 3c49948c..8d517801 100644
--- a/desktop_version/src/Map.h
+++ b/desktop_version/src/Map.h
@@ -86,8 +86,6 @@ public:
     std::vector <int> explored;
     std::vector <int> vmult;
 
-    int temp;
-    int temp2;
     int background;
     int rcol;
     int tileset;