From ca33ec4563e05b0940e44de78e0f52bbbf6bfe41 Mon Sep 17 00:00:00 2001 From: Andrew Kurushin Date: Fri, 22 Apr 2005 16:41:44 +0000 Subject: fixes sfEnableZone ( 'house' problem ) svn-id: r17751 --- saga/sfuncs.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp index c3e3d0bff7..9a6d6616ab 100644 --- a/saga/sfuncs.cpp +++ b/saga/sfuncs.cpp @@ -665,12 +665,16 @@ void Script::sfScriptWalkToAsync(SCRIPTFUNC_PARAMS) { // 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); -- cgit v1.2.3