[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.276,1.277 scumm.cpp,1.402,1.403

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5255/scumm

Modified Files:
	script_v5.cpp scumm.cpp 
Log Message:

This section of startScene only exists in scumm5 onwards.


Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- script_v5.cpp	6 Apr 2005 02:26:47 -0000	1.276
+++ script_v5.cpp	6 Apr 2005 05:04:29 -0000	1.277
@@ -1507,6 +1507,8 @@
 	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);

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- scumm.cpp	6 Apr 2005 02:11:07 -0000	1.402
+++ scumm.cpp	6 Apr 2005 05:04:39 -0000	1.403
@@ -2245,11 +2245,11 @@
 
 	memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
 
-	if (a) {
+	if (_version >= 5 && a) {
 		where = whereIsObject(objectNr);
 		if (where != WIO_ROOM && where != WIO_FLOBJECT)
 			error("startScene: Object %d is not in room %d", objectNr,
-						_currentRoom);
+					_currentRoom);
 		int x, y, dir;
 		getObjectXYPos(objectNr, x, y, dir);
 		a->putActor(x, y, _currentRoom);