aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Eriksson2003-10-16 16:58:30 +0000
committerDavid Eriksson2003-10-16 16:58:30 +0000
commitebcfb7c820fd82b491693e9f3c1b5c97257f8977 (patch)
tree1443820bc4c9f590538d611009846bd7781fa790
parent5daae674042d80cd8f1e5c23e02ef6e996ae189f (diff)
downloadscummvm-rg350-ebcfb7c820fd82b491693e9f3c1b5c97257f8977.tar.gz
scummvm-rg350-ebcfb7c820fd82b491693e9f3c1b5c97257f8977.tar.bz2
scummvm-rg350-ebcfb7c820fd82b491693e9f3c1b5c97257f8977.zip
Initialize Joe's scaling.
svn-id: r10830
-rw-r--r--queen/logic.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 7706dfb9e4..1ee9673fc2 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -32,6 +32,7 @@ Logic::Logic(Resource *resource, Graphics *graphics, Display *display)
: _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 @@ uint16 Logic::roomRefreshObject(uint16 obj) {
// 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;
}