[Scummvm-cvs-logs] SF.net SVN: scummvm:[54622] scummvm/trunk/engines/mohawk

bgk at users.sourceforge.net bgk at users.sourceforge.net
Mon Nov 29 21:57:12 CET 2010


Revision: 54622
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54622&view=rev
Author:   bgk
Date:     2010-11-29 20:57:11 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
MOHAWK: Fix flag values used to dertermine if an area can become active.

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst.cpp
    scummvm/trunk/engines/mohawk/myst_areas.cpp
    scummvm/trunk/engines/mohawk/myst_areas.h

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:56:56 UTC (rev 54621)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2010-11-29 20:57:11 UTC (rev 54622)
@@ -501,7 +501,7 @@
 	for (uint16 i = 0; i < _resources.size(); i++) {
 		_resources[i]->getRect().debugPrint(0);
 		if (_resources[i]->getRect().isValidRect()) {
-			if (_resources[i]->unreachableZipDest())
+			if (!_resources[i]->canBecomeActive())
 				_gfx->drawRect(_resources[i]->getRect(), kRectUnreachable);
 			else if (_resources[i]->isEnabled())
 				_gfx->drawRect(_resources[i]->getRect(), kRectEnabled);
@@ -518,7 +518,7 @@
 	bool foundResource = false;
 
 	for (uint16 i = 0; i < _resources.size(); i++)
-		if (!_resources[i]->unreachableZipDest() &&
+		if (_resources[i]->canBecomeActive() &&
 				_resources[i]->contains(_system->getEventManager()->getMousePos())) {
 			if (_curResource != i) {
 				if (_curResource != -1 && _resources[_curResource]->isEnabled())

Modified: scummvm/trunk/engines/mohawk/myst_areas.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst_areas.cpp	2010-11-29 20:56:56 UTC (rev 54621)
+++ scummvm/trunk/engines/mohawk/myst_areas.cpp	2010-11-29 20:57:11 UTC (rev 54622)
@@ -75,6 +75,10 @@
 		warning("Movement type resource with null destination at position (%d, %d), (%d, %d)", _rect.left, _rect.top, _rect.right, _rect.bottom);
 }
 
+bool MystResource::canBecomeActive() {
+	return !unreachableZipDest() && (isEnabled() || (_flags & kMystUnknownFlag));
+}
+
 bool MystResource::unreachableZipDest() {
 	return (_flags & kMystZipModeEnableFlag) && !_vm->_zipMode;
 }

Modified: scummvm/trunk/engines/mohawk/myst_areas.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst_areas.h	2010-11-29 20:56:56 UTC (rev 54621)
+++ scummvm/trunk/engines/mohawk/myst_areas.h	2010-11-29 20:57:11 UTC (rev 54622)
@@ -49,6 +49,7 @@
 	uint16 getDest() { return _dest; }
 	virtual uint16 getType8Var() { return 0xFFFF; }
 	bool unreachableZipDest();
+	bool canBecomeActive();
 
 	// Mouse interface
 	virtual void handleMouseUp(Common::Point *mouse);


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




More information about the Scummvm-git-logs mailing list