[Scummvm-cvs-logs] scummvm master -> 1f9f08c93583fe397ba2dabc5d8f6deaf9f5fb40

eriktorbjorn eriktorbjorn at telia.com
Sun Jul 21 10:04:44 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1f9f08c935 SCUMM: Fix test before running VAR_SAVELOAD_SCRIPT2 (CID 1004135)


Commit: 1f9f08c93583fe397ba2dabc5d8f6deaf9f5fb40
    https://github.com/scummvm/scummvm/commit/1f9f08c93583fe397ba2dabc5d8f6deaf9f5fb40
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-07-21T01:02:02-07:00

Commit Message:
SCUMM: Fix test before running VAR_SAVELOAD_SCRIPT2 (CID 1004135)

This doesn't really make any difference because either both
VAR_SAVELOAD_SCRIPT and VAR_SAVELOAD_SCRIPT2 exist, or neither
does. But it feels more correct this way.

Changed paths:
    engines/scumm/input.cpp



diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index ee2de49..d1786df 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -535,7 +535,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
 
 		openMainMenuDialog();		// Display global main menu
 
-		if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
+		if (VAR_SAVELOAD_SCRIPT2 != 0xFF && _currentRoom != 0)
 			runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);
 
 	} else if (restartKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_F8 && lastKeyHit.hasFlags(0))) {






More information about the Scummvm-git-logs mailing list