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

[thebluegr at users.sourceforge.net]

Revision: 28329
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28329&view=rev
Author:   thebluegr
Date:     2007-07-30 09:16:22 -0700 (Mon, 30 Jul 2007)

Log Message:
-----------
The disk icon is now shown in the IHNM demo (though it's not functional yet)

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

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-07-30 16:12:40 UTC (rev 28328)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-07-30 16:16:22 UTC (rev 28329)
@@ -338,8 +338,7 @@
 		_vm->_actor->_protagonist->_targetObject = ID_NOTHING;
 		unlockMode();
 		if (_panelMode == kPanelMain || _panelMode == kPanelChapterSelection) {
-			if (_vm->getGameId() != GID_IHNM_DEMO)
-				_saveReminderState = 1;
+			_saveReminderState = 1;
 		}
 		draw();
 	}
@@ -382,21 +381,33 @@
 void Interface::setMode(int mode) {
 	debug(1, "Interface::setMode %i", mode);
 
+	// The non-interactive part of the IHNM demo does not have an options
+	// screen - the psychic profile screen is displayed instead, with some
+	// dialog options (help, play non-interactive demo, play interactive demo, quit)
+	// TODO: Show the psychic profile screen in the non-interactive demo and show
+	// the normal options screen in the interactive demo
+	if (_vm->getGameId() == GID_IHNM_DEMO && mode == kPanelOption)
+		mode = kPanelNull;
+
 	if (mode == kPanelMain) {
 		_inMainMode = true;
-		if (_vm->getGameId() != GID_IHNM_DEMO)
-			_saveReminderState = 1; //TODO: blinking timeout
+		_saveReminderState = 1; //TODO: blinking timeout
 	} else if (mode == kPanelChapterSelection) {
-		if (_vm->getGameId() != GID_IHNM_DEMO)
-			_saveReminderState = 1;
+		_saveReminderState = 1;
 	} else if (mode == kPanelNull) {
-		if (_vm->getGameId() == GID_IHNM_DEMO)
+		if (_vm->getGameId() == GID_IHNM_DEMO) {
 			_inMainMode = true;
+			_saveReminderState = 1;
+		}
 	} else {
 		if (mode == kPanelConverse) {
 			_inMainMode = false;
 		}
-		_saveReminderState = 0;
+
+		if (_vm->getGameId() != GID_IHNM_DEMO)
+			_saveReminderState = 0;
+		else
+			_saveReminderState = 1;
 	}
 
 	_panelMode = mode;


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