[Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.47,1.48

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Thu Jul 15 23:58:06 CEST 2004


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14696

Modified Files:
	sword1.cpp 
Log Message:
Open the control panel on both F5 and ESC, like the original did.


Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sword1.cpp	11 Jul 2004 04:41:48 -0000	1.47
+++ sword1.cpp	16 Jul 2004 06:57:47 -0000	1.48
@@ -1196,7 +1196,10 @@
 
 			if (_systemVars.forceRestart)
 				retCode = CONTROL_RESTART_GAME;
-			else if (((_keyPressed == 63) && (Logic::_scriptVars[MOUSE_STATUS] & 1)) || (_systemVars.deathScreenFlag)) {
+
+			// The control panel is triggered by F5 or ESC.
+			// FIXME: This is a very strange way of detecting F5...
+			else if (((_keyPressed == 63 || _keyPressed == 27) && (Logic::_scriptVars[MOUSE_STATUS] & 1)) || (_systemVars.deathScreenFlag)) {
 				retCode = _control->runPanel();
 				if (!retCode)
 					_screen->fullRefresh();





More information about the Scummvm-git-logs mailing list