[Scummvm-cvs-logs] CVS: scummvm/saga sfuncs.cpp,1.104,1.105

[Andrew Kurushin]

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

Modified Files:
	sfuncs.cpp 
Log Message:
fixes sfEnableZone  ( 'house' problem )

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- sfuncs.cpp	22 Apr 2005 14:11:03 -0000	1.104
+++ sfuncs.cpp	22 Apr 2005 16:41:44 -0000	1.105
@@ -665,12 +665,16 @@
 
 // Script function #28 (0x1C)
 void Script::sfEnableZone(SCRIPTFUNC_PARAMS) {
-	int16 hitZoneIndex = objectIdToIndex(thread->pop());
+	uint16 objectId = thread->pop();
 	int16 flag = thread->pop();
 	HitZone *hitZone;
 
-	debug(0, "sfEnableZone(%d, %d)", hitZoneIndex, flag);
-	hitZone = _vm->_scene->_objectMap->getHitZone(hitZoneIndex);
+	debug(0, "sfEnableZone(%d, %d)", objectId, flag);
+	if (objectTypeId(objectId) == kGameObjectHitZone) {
+		hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(objectId));
+	} else {
+		hitZone = _vm->_scene->_actionMap->getHitZone(objectIdToIndex(objectId));
+	}
 
 	if (flag) {
 		hitZone->setFlag(kHitZoneEnabled);