From ec6562826af499ffa9674bf4ac3c6f948b6cda4a Mon Sep 17 00:00:00 2001
From: galaxyhaxz <galaxy-haxz@hotmail.com>
Date: Sun, 7 Jul 2019 14:07:45 -0500
Subject: [PATCH] Fix L4firstRoom variables

---
 Source/drlg_l4.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Source/drlg_l4.cpp b/Source/drlg_l4.cpp
index 9725ec730..b69478970 100644
--- a/Source/drlg_l4.cpp
+++ b/Source/drlg_l4.cpp
@@ -1530,7 +1530,7 @@ long GetArea()
 
 void L4firstRoom()
 {
-	int x, y, w, h, rndx, rndy; /* xmin, xmax, ymin, ymax */
+	int x, y, w, h, rndx, rndy, xmin, xmax, ymin, ymax;
 
 	if (currlevel != 16) {
 		if (currlevel == quests[QTYPE_WARLRD]._qlevel && quests[QTYPE_WARLRD]._qactive) {
@@ -1549,13 +1549,17 @@ void L4firstRoom()
 		h = 14;
 	}
 
-	rndx = random(0, 19 - w - ((20 - w) >> 1) + 1) + ((20 - w) >> 1);
+	xmin = (20 - w) >> 1;
+	xmax = 19 - w;
+	rndx = random(0, xmax - xmin + 1) + xmin;
 	if (rndx + w > 19) {
 		x = 19 - w + 1;
 	} else {
 		x = rndx;
 	}
-	rndy = random(0, 19 - h - ((20 - h) >> 1) + 1) + ((20 - h) >> 1);
+	ymin = (20 - h) >> 1;
+	ymax = 19 - h;
+	rndy = random(0, ymax - ymin + 1) + ymin;
 	if (rndy + h > 19) {
 		y = 19 - h + 1;
 	} else {