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

[thebluegr at users.sourceforge.net]

Revision: 28346
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28346&view=rev
Author:   thebluegr
Date:     2007-07-30 17:18:45 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
The mouse works correctly now in the options dialog when it's opened in the non-interactive part of the IHNM demo

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

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-07-31 00:06:57 UTC (rev 28345)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-07-31 00:18:45 UTC (rev 28346)
@@ -1603,9 +1603,11 @@
 		_vm->_actor->abortSpeech();
 
 	if (_vm->_scene->isInIntro() || _fadeMode == kFadeOut || !_active) {
-		// When opening the psychic profile, the interface is locked (_active is false)
-		// Don't return if the psychic profile is up, so that mouse clicks can be processed
-		if (!(_vm->getGameType() == GType_IHNM && _panelMode == kPanelPlacard && (updateFlag & UPDATE_MOUSECLICK)))
+		// When opening the psychic profile, or the options screen in the non-interactive part of the IHNM demo,
+		// the interface is locked (_active is false)
+		// Don't return in those cases, so that mouse actions can be processed
+		if (!(_vm->getGameType() == GType_IHNM && _panelMode == kPanelPlacard && (updateFlag & UPDATE_MOUSECLICK)) &&
+			!(_vm->getGameId() == GID_IHNM_DEMO && (_panelMode == kPanelOption || _panelMode == kPanelQuit)))
 			return;
 	}
 


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