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

[thebluegr at users.sourceforge.net]

Revision: 27443
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27443&view=rev
Author:   thebluegr
Date:     2007-06-16 01:27:53 -0700 (Sat, 16 Jun 2007)

Log Message:
-----------
Enable the options panel during chapter selection in IHNM. The icon is not yet functional during chapter selection, but the keyboard shortcuts work

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

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-06-16 06:36:16 UTC (rev 27442)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-06-16 08:27:53 UTC (rev 27443)
@@ -315,7 +315,7 @@
 		_vm->_script->_skipSpeeches = false;
 		_vm->_actor->_protagonist->_targetObject = ID_NOTHING;
 		unlockMode();
-		if (_panelMode == kPanelMain){
+		if (_panelMode == kPanelMain || _panelMode == kPanelChapterSelection){
 			_saveReminderState = 1;
 		}
 		draw();
@@ -357,6 +357,8 @@
 	if (mode == kPanelMain) {
 		_inMainMode = true;
 		_saveReminderState = 1; //TODO: blinking timeout
+	} else if (mode == kPanelChapterSelection) {
+		_saveReminderState = 1;
 	} else {
 		if (mode == kPanelConverse) {
 			_inMainMode = false;
@@ -1433,7 +1435,10 @@
 	switch (panelButton->id) {
 	case kTextContinuePlaying:
 		ConfMan.flushToDisk();
-		setMode(kPanelMain);
+		if (!(_vm->getGameType() == GType_IHNM && _vm->_scene->currentChapterNumber() == 8))
+			setMode(kPanelMain);
+		else
+			setMode(kPanelChapterSelection);
 		break;
 	case kTextQuitGame:
 		setMode(kPanelQuit);


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