[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.30,1.31 logic.cpp,1.74,1.75

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv5602

Modified Files:
	queen.cpp logic.cpp 
Log Message:
fix demo crash after introduction

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- queen.cpp	4 Nov 2003 14:43:53 -0000	1.30
+++ queen.cpp	4 Nov 2003 19:51:31 -0000	1.31
@@ -105,6 +105,8 @@
 }
 
 QueenEngine::~QueenEngine() {
+
+	_timer->removeTimerProc(&timerHandler);
 	delete _resource;
 	delete _display;
 	delete _logic;
@@ -158,7 +160,7 @@
 			_logic->playCutaway("cred.cut");
 		}
 
-		_logic->currentRoom(ROOM_HOTEL_LOBBY); //ROOM_HOTEL_UPSTAIRS);
+		_logic->currentRoom(ROOM_HOTEL_LOBBY);
 		_logic->entryObj(584);
 
 		_logic->roomDisplay(_logic->roomName(_logic->currentRoom()), RDM_FADE_JOE, 100, 2, true);

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- logic.cpp	4 Nov 2003 13:51:36 -0000	1.74
+++ logic.cpp	4 Nov 2003 19:51:31 -0000	1.75
@@ -1062,6 +1062,11 @@
 
 	uint16 curImage = _numFrames;
 
+	if (obj == 0 || obj > _numObjects) {
+		warning("Invalid object number %d", obj);
+		return curImage;
+	}
+
 	ObjectData *pod = &_objectData[obj];
 	if (pod->image == 0) {
 		return curImage;
@@ -1070,7 +1075,7 @@
 	// check the object is in the current room
 	if (pod->room != _currentRoom) {
 		warning("Logic::roomRefreshObject() - Trying to display an object (%i=%s) that is not in room (object room=%i, current room=%i)",
-				obj, _objName[_objectData[obj].name], pod->room, _currentRoom);
+			obj, _objName[ABS(pod->name)], pod->room, _currentRoom);
 		return curImage;
 	}