From 59fad44d4ce0314c3247529f7c11287eac249aeb Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <adunstan@corecodec.com>
Date: Fri, 7 Sep 2018 14:01:59 +1000
Subject: [PATCH] L5roomGen: correct type of dir (bool -> BOOL), fixes
 "reference to variable dir exceeds its storage space" warning

---
 Source/drlg_l1.cpp | 12 ++++++------
 Source/drlg_l1.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/drlg_l1.cpp b/Source/drlg_l1.cpp
index 9a4578602..c20ef37fb 100644
--- a/Source/drlg_l1.cpp
+++ b/Source/drlg_l1.cpp
@@ -1351,11 +1351,11 @@ void __fastcall L5drawRoom(int x, int y, int w, int h)
 	}
 }
 
-void __fastcall L5roomGen(int x, int y, int w, int h, bool dir)
+void __fastcall L5roomGen(int x, int y, int w, int h, BOOL dir)
 {
 	int v5; // eax
-	int v6; // ecx
-	int v7; // eax
+	BOOL v6; // ecx
+	BOOL v7; // eax
 	int v8; // ecx
 	int v9; // eax
 	int v11; // esi
@@ -1391,7 +1391,7 @@ void __fastcall L5roomGen(int x, int y, int w, int h, bool dir)
 		{
 			v5 = random(0, 4);
 			v6 = 0;
-			_LOBYTE(v6) = dir == 1 ? v5 != 0 : v5 == 0;
+			v6 = dir == 1 ? v5 != 0 : v5 == 0;
 			v7 = v6;
 			v8 = 0;
 			if ( !v7 )
@@ -1423,7 +1423,7 @@ void __fastcall L5roomGen(int x, int y, int w, int h, bool dir)
 				L5roomGen(v13, tya, v11, v12, 0);
 			if ( tha != 1 )
 				return;
-			*(_DWORD *)&dir = 0;
+			dir = 0;
 			h = v12;
 			w = v11;
 			v29 = txb;
@@ -1454,7 +1454,7 @@ void __fastcall L5roomGen(int x, int y, int w, int h, bool dir)
 			L5roomGen(tyb, v20, v18, v19, 1);
 		if ( thc != 1 )
 			break;
-		*(_DWORD *)&dir = 1;
+		dir = 1;
 		h = v19;
 		w = v18;
 		v29 = v20;
diff --git a/Source/drlg_l1.h b/Source/drlg_l1.h
index 6997cbe67..8660931b7 100644
--- a/Source/drlg_l1.h
+++ b/Source/drlg_l1.h
@@ -30,7 +30,7 @@ void __cdecl InitL5Dungeon();
 void __cdecl L5ClearFlags();
 void __cdecl L5firstRoom();
 void __fastcall L5drawRoom(int x, int y, int w, int h);
-void __fastcall L5roomGen(int x, int y, int w, int h, bool dir);
+void __fastcall L5roomGen(int x, int y, int w, int h, BOOL dir);
 bool __fastcall L5checkRoom(int x, int y, int width, int height);
 int __cdecl L5GetArea();
 void __cdecl L5makeDungeon();