[Scummvm-cvs-logs] SF.net SVN: scummvm: [24832] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 24832
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24832&view=rev
Author:   fingolfin
Date:     2006-12-10 06:28:37 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Patch #1296058: Showing the original save/load dialog (see also RFE #832460)

Modified Paths:
--------------
    scummvm/trunk/README
    scummvm/trunk/doc/running-hotkeys.tex
    scummvm/trunk/engines/scumm/input.cpp

Modified: scummvm/trunk/README
===================================================================
--- scummvm/trunk/README	2006-12-10 00:44:40 UTC (rev 24831)
+++ scummvm/trunk/README	2006-12-10 14:28:37 UTC (rev 24832)
@@ -810,6 +810,12 @@
         [ and ]                - Music volume, down/up
         - and +                - Text speed, slower/faster
         F5                     - Displays a save/load box
+        Alt-F5                 - Displays the original save/load box, if the
+                                 game has one. This is not intended for saving
+                                 or loading a game, and may even crash ScummVM
+                                 in some games, but it is currently the only
+                                 way to see your IQ points in Indiana Jones and
+                                 the Last Crusade without dying.
         Space                  - Pauses
         Period (.)             - Skips current line of text in some games
         Enter                  - Simulate left mouse button press

Modified: scummvm/trunk/doc/running-hotkeys.tex
===================================================================
--- scummvm/trunk/doc/running-hotkeys.tex	2006-12-10 00:44:40 UTC (rev 24831)
+++ scummvm/trunk/doc/running-hotkeys.tex	2006-12-10 14:28:37 UTC (rev 24832)
@@ -34,6 +34,12 @@
     $[$ and $]$                & Music volume, down/up\\
     - and +                & Text speed, slower/faster\\
     F5                     & Displays a save/load box\\
+    Alt-F5                 & Displays the original save/load box, if the game\\
+                           & has one. This is not intended for saving or\\
+                           & loading a game, and may even crash ScummVM in\\
+                           & some games, but it is currently the only way to\\
+                           & see your IQ points in Indiana Jones and the Last\\
+                           & Crusade without dying.\\
     Space                  & Pauses\\
     Period (.)             & Skips current line of text in some games\\
     Enter                  & Simulate left mouse button press\\

Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp	2006-12-10 00:44:40 UTC (rev 24831)
+++ scummvm/trunk/engines/scumm/input.cpp	2006-12-10 14:28:37 UTC (rev 24832)
@@ -313,6 +313,12 @@
 
 #ifndef DISABLE_SCUMM_7_8
 void ScummEngine_v8::processKeyboard(int lastKeyHit) {
+	// Alt-F5 brings up the original save/load dialog
+
+	if (lastKeyHit == 440 && !(_game.features & GF_DEMO)) {
+		lastKeyHit = 315;
+	}
+
 	// If a key script was specified (a V8 feature), and it's trigger
 	// key was pressed, run it.
 	if (_keyScriptNo && (_keyScriptKey == lastKeyHit)) {
@@ -435,6 +441,12 @@
 			// Fall back to default behavior
 			ScummEngine::processKeyboard(lastKeyHit);
 		}
+
+		// Alt-F5 brings up the original save/load dialog
+
+		if (lastKeyHit == 440) {
+			lastKeyHit = 314+5;
+		}
 	
 		// Store the input type. So far we can't distinguish
 		// between 1, 3 and 5.
@@ -469,6 +481,13 @@
 	else
 		saveloadkey = VAR(VAR_MAINMENU_KEY);
 
+	// Alt-F5 brings up the original save/load dialog.
+
+	if (lastKeyHit == 440 && _game.version > 2 && _game.version < 8) {
+		lastKeyHit = saveloadkey;
+		saveloadkey = -1;
+	}
+
 	if (lastKeyHit == saveloadkey) {
 		if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
 			runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);


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