[Scummvm-cvs-logs] SF.net SVN: scummvm:[45773] scummvm/trunk/engines/teenagent/inventory.cpp

megath at users.sourceforge.net megath at users.sourceforge.net
Mon Nov 9 09:23:19 CET 2009


Revision: 45773
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45773&view=rev
Author:   megath
Date:     2009-11-09 08:23:19 +0000 (Mon, 09 Nov 2009)

Log Message:
-----------
do not trigger examine object while inventory is inactive

Modified Paths:
--------------
    scummvm/trunk/engines/teenagent/inventory.cpp

Modified: scummvm/trunk/engines/teenagent/inventory.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/inventory.cpp	2009-11-09 07:58:27 UTC (rev 45772)
+++ scummvm/trunk/engines/teenagent/inventory.cpp	2009-11-09 08:23:19 UTC (rev 45773)
@@ -152,8 +152,11 @@
 
 	case Common::EVENT_LBUTTONDOWN: {
 		//check combine
+		if (!_active)
+			return false;
+			
 		if (hovered_obj == NULL)
-			return _active;
+			return true;
 
 		if (selected_obj == NULL) {
 			activate(false);


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