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

[thebluegr at users.sourceforge.net]

Revision: 29266
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29266&view=rev
Author:   thebluegr
Date:     2007-10-27 10:55:50 -0700 (Sat, 27 Oct 2007)

Log Message:
-----------
The options panel in IHNM is now shown and functioning correctly when it's opened during a character's speech

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

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-10-27 16:10:50 UTC (rev 29265)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-10-27 17:55:50 UTC (rev 29266)
@@ -1623,9 +1623,19 @@
 		// 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)))
+		if (_vm->getGameType() == GType_ITE) {
 			return;
+		} else {
+			if (_panelMode == kPanelPlacard && (updateFlag & UPDATE_MOUSECLICK)) {
+				// the psychic profile or the special screen in IHNM demo is open, don't return
+			} else if (_panelMode == kPanelOption || _panelMode == kPanelQuit) {
+				// options/quit panel is open, set interface to active and don't return
+				_vm->_actor->abortSpeech();	// abort any speech being played
+				_active = true;
+			} else {
+				return;
+			}
+		}
 	}
 
 	if (_statusTextInput) {


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