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

[thebluegr at users.sourceforge.net]

Revision: 28742
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28742&view=rev
Author:   thebluegr
Date:     2007-08-25 20:22:52 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
The character selection screen shown when all the 5 protagonist chapters are completed is now functional

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

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-08-26 01:36:01 UTC (rev 28741)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-08-26 03:22:52 UTC (rev 28742)
@@ -1468,11 +1468,22 @@
 
 void Interface::handleChapterSelectionUpdate(const Point& mousePoint) {
 	uint16 objectId;
+	int hitZoneIndex;
+	const HitZone * hitZone;
 
 	// FIXME: Original handled more object types here.
 
 	objectId = _vm->_actor->hitTest(mousePoint, true);
 
+	if (objectId == ID_NOTHING) {
+		hitZoneIndex = _vm->_scene->_objectMap->hitTest(mousePoint);
+
+		if ((hitZoneIndex != -1)) {
+			hitZone = _vm->_scene->_objectMap->getHitZone(hitZoneIndex);
+			objectId = hitZone->getHitZoneId();
+		}
+	}
+
 	if (objectId != _vm->_script->_pointerObject) {
 		_vm->_script->_pointerObject = objectId;
 	}
@@ -1492,12 +1503,12 @@
 
 		switch (objectTypeId(obj)) {
 		case kGameObjectHitZone:
-			hitZone = _vm->_scene->_actionMap->getHitZone(objectIdToIndex(obj));
+			hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(obj));
 
 			if (hitZone == NULL)
 				return;
 
-			if (hitZone->getFlags() & kHitZoneExit)
+			if (hitZone->getFlags() & kHitZoneEnabled)
 				script = hitZone->getScriptNumber();
 			break;
 


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