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

[thebluegr at users.sourceforge.net]

Revision: 28731
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28731&view=rev
Author:   thebluegr
Date:     2007-08-25 12:21:43 -0700 (Sat, 25 Aug 2007)

Log Message:
-----------
When sfMainMode is set, overwrite the stored panel mode

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

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-08-25 18:24:32 UTC (rev 28730)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-08-25 19:21:43 UTC (rev 28731)
@@ -367,7 +367,7 @@
 }
 
 void Interface::rememberMode() {
-	debug(1, "rememberMode(%d)", _savedMode);
+	debug(1, "rememberMode(%d)", _panelMode);
 
 	_savedMode = _panelMode;
 }

Modified: scummvm/trunk/engines/saga/sfuncs.cpp
===================================================================
--- scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-25 18:24:32 UTC (rev 28730)
+++ scummvm/trunk/engines/saga/sfuncs.cpp	2007-08-25 19:21:43 UTC (rev 28731)
@@ -323,6 +323,12 @@
 	showVerb();
 	_vm->_interface->activate();
 	_vm->_interface->setMode(kPanelMain);
+	// Sometimes, the active cutaway is cleared after this opcode is called,
+	// resulting in an incorrect mode being set. An example is Ellen's chapter
+	// in IHNM, when using the computer with the chaos trebler CD. Make sure
+	// that the saved mode is kPanelMain, so that it won't get overwritten
+	// by an incorrect stored mode
+	_vm->_interface->rememberMode();
 
 	if (_vm->getGameType() == GType_ITE)
 		setPointerVerb();


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