From 6f3644f377cb298cb82d7a9235b9aec4cfa875ea Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 4 Dec 2015 22:52:55 +0200
Subject: LAB: Fix a regression in roomCoords()

---
 engines/lab/map.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/engines/lab/map.cpp b/engines/lab/map.cpp
index 36591d759b..4df01eae36 100644
--- a/engines/lab/map.cpp
+++ b/engines/lab/map.cpp
@@ -253,12 +253,20 @@ static void roomCoords(uint16 CurRoom, uint16 *x1, uint16 *y1, uint16 *x2, uint1
 	case HCORRIDOR:
 		curRoomImg = HRoom;
 		break;
+	default:
+		// Some rooms (like the map) do not have an image
+		break;
 	}
 
 	*x1 = mapScaleX(Maps[CurRoom].x);
 	*y1 = mapScaleY(Maps[CurRoom].y);
-	*x2 = *x1 + curRoomImg->_width;
-	*y2 = *y1 + curRoomImg->_height;
+	*x2 = *x1;
+	*y2 = *y1;
+
+	if (curRoomImg) {
+		*x2 += curRoomImg->_width;
+		*y2 += curRoomImg->_height;
+	}
 }
 
 /*****************************************************************************/
-- 
cgit v1.2.3