[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.44,1.45

[David Eriksson]

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

Modified Files:
	logic.cpp 
Log Message:
Initialize Joe's scaling.


Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- logic.cpp	16 Oct 2003 13:54:48 -0000	1.44
+++ logic.cpp	16 Oct 2003 16:58:30 -0000	1.45
@@ -32,6 +32,7 @@
 	: _resource(resource), _graphics(graphics), _display(display), _talkSpeed(DEFAULT_TALK_SPEED) {
 	_jas = _resource->loadFile("QUEEN.JAS", 20);
 	_joe.x = _joe.y = 0;
+	_joe.scale = 100;
 	_walk = new Walk(this, _graphics);
 	memset(_gameState, 0, sizeof(_gameState));
 	initialise();
@@ -1002,7 +1003,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[obj], pod->room, _currentRoom);
+				obj, _objName[_objectData[obj].name], pod->room, _currentRoom);
 		return curImage;
 	}