[Scummvm-cvs-logs] SF.net SVN: scummvm: [28313] scummvm/trunk/engines/saga/sfuncs.cpp

[thebluegr at users.sourceforge.net]

Revision: 28313
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28313&view=rev
Author:   thebluegr
Date:     2007-07-29 12:06:17 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
Inventory icons in the IHNM demo are displayed correctly now

Modified Paths:
--------------
    scummvm/trunk/engines/saga/sfuncs.cpp

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2007-07-29 18:49:24 UTC (rev 28312)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2007-07-29 19:06:17 UTC (rev 28313)
@@ -277,7 +277,16 @@
 	obj = _vm->_actor->getObj(objectId);
 	if (obj->_sceneNumber != ITE_SCENE_INV) {
 		obj->_sceneNumber = ITE_SCENE_INV;
-		//4debug for (int j=0;j<17;j++)
+
+		// WORKAROUND for two incorrect object sprites in the IHNM demo
+		// (the mirror and the icon in Ted's part). Set them correctly here
+		if (_vm->getGameId() == GID_IHNM_DEMO) {
+			if (obj->_spriteListResourceId == 4)
+				obj->_spriteListResourceId = 24;
+			if (obj->_spriteListResourceId == 3)
+				obj->_spriteListResourceId = 25;
+		}
+
 		_vm->_interface->addToInventory(objectId);
 	}
 }
@@ -870,10 +879,16 @@
 		_vm->_scene->currentSceneNumber() == 59 && obj->_id == 16385)
 			obj->_sceneNumber = -1;
 
-	if (_vm->getGameType() == GType_IHNM)
-		obj->_spriteListResourceId = spriteId;
-	else
+	if (_vm->getGameType() == GType_IHNM) {
+		if (_vm->getGameId() != GID_IHNM_DEMO) {
+			obj->_spriteListResourceId = spriteId;
+		} else {
+			// Don't update the object's _spriteListResourceId in the IHNM demo, as this function is
+			// called incorrectly there (with spriteId == 0, which resets the object sprites)
+		}
+	} else {
 		obj->_spriteListResourceId = OBJ_SPRITE_BASE + spriteId;
+	}
 
 	obj->_location.x = x;
 	obj->_location.y = y;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.