From 382b83a54d847c37f08f4d98d9d01816b8c10fbb Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Fri, 16 Apr 2021 23:08:27 -0700
Subject: [PATCH] Move roomchangedir off of Game

This is a temporary variable that doesn't need to be on Game. It is
guaranteed to be initialized every time mapclass::gotoroom() gets
called, so it's safe to move it off.
---
 desktop_version/src/Game.h  | 2 +-
 desktop_version/src/Map.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/desktop_version/src/Game.h b/desktop_version/src/Game.h
index c52cd954..2218d386 100644
--- a/desktop_version/src/Game.h
+++ b/desktop_version/src/Game.h
@@ -215,7 +215,7 @@ public:
     int door_right;
     int door_up;
     int door_down;
-    int roomx, roomy, roomchangedir;
+    int roomx, roomy;
     int prevroomx, prevroomy;
 
     int savex, savey, saverx, savery;
diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp
index 385cbc64..180e1427 100644
--- a/desktop_version/src/Map.cpp
+++ b/desktop_version/src/Map.cpp
@@ -903,6 +903,8 @@ void mapclass::warpto(int rx, int ry , int t, int tx, int ty)
 
 void mapclass::gotoroom(int rx, int ry)
 {
+	int roomchangedir;
+
 	//First, destroy the current room
 	obj.removeallblocks();
 	game.activetele = false;
@@ -953,11 +955,11 @@ void mapclass::gotoroom(int rx, int ry)
 
 	if (rx < game.roomx)
 	{
-		game.roomchangedir = 0;
+		roomchangedir = 0;
 	}
 	else
 	{
-		game.roomchangedir = 1;
+		roomchangedir = 1;
 	}
 
 	if (finalmode)
@@ -1073,7 +1075,7 @@ void mapclass::gotoroom(int rx, int ry)
 					{
 						//y's match, how about x's?
 						//we're moving left:
-						if (game.roomchangedir == 0)
+						if (roomchangedir == 0)
 						{
 							if (obj.entities[i].xp + obj.entities[i].w >= 312 && obj.linecrosskludge[j].xp <= 0)
 							{