From c66e6bb001f62a9c04951ffd1972dc68de3d44ef Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Wed, 6 Apr 2005 05:04:39 +0000
Subject: This section of startScene only exists in scumm5 onwards.

svn-id: r17409
---
 scumm/script_v5.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scumm/script_v5.cpp')

diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 6430843e18..0e06bf0d0b 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1507,6 +1507,8 @@ void ScummEngine_v5::o5_loadRoomWithEgo() {
 	VAR(VAR_WALKTO_OBJ) = 0;
 
 	if (_version <= 4) {
+		if (whereIsObject(obj) != WIO_ROOM)
+			error("startScene: Object %d is not in room %d", obj, _currentRoom);
 		if (!_egoPositioned) {
 			getObjectXYPos(obj, x2, y2, dir);
 			a->putActor(x2, y2, _currentRoom);
-- 
cgit v1.2.3