[Scummvm-cvs-logs] CVS: scummvm/sword1 sword1.cpp,1.39.2.2,1.39.2.3

[Torbjörn Andersson]

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

Modified Files:
      Tag: branch-0-6-0
	sword1.cpp 
Log Message:
Allow both ESC and F5 to bring up the control panel. (Backport from trunk.)


Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -d -r1.39.2.2 -r1.39.2.3
--- sword1.cpp	11 Jul 2004 04:36:56 -0000	1.39.2.2
+++ sword1.cpp	18 Jul 2004 17:16:57 -0000	1.39.2.3
@@ -1184,7 +1184,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();