[Scummvm-cvs-logs] scummvm master -> 46b020d8603ce06ac08128ee89395fe86a7c67e7

Kirben kirben at optusnet.com.au
Thu Nov 17 13:02:23 CET 2011


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:
46b020d860 SCUMM: Add code to support different keys used for skipping cutscenes in early ports of Maniac Mansion and Zak McKracken


Commit: 46b020d8603ce06ac08128ee89395fe86a7c67e7
    https://github.com/scummvm/scummvm/commit/46b020d8603ce06ac08128ee89395fe86a7c67e7
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-11-17T04:01:47-08:00

Commit Message:
SCUMM: Add code to support different keys used for skipping cutscenes in early ports of Maniac Mansion and Zak McKracken.

Changed paths:
    engines/scumm/input.cpp



diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 6d9e1f3..ee2de49 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -446,6 +446,23 @@ void ScummEngine_v6::processKeyboard(Common::KeyState lastKeyHit) {
 }
 
 void ScummEngine_v2::processKeyboard(Common::KeyState lastKeyHit) {
+	// RETURN is used to skip cutscenes in the Commodote 64 version of Zak McKracken
+	if (_game.id == GID_ZAK &&_game.platform == Common::kPlatformC64 && lastKeyHit.keycode == Common::KEYCODE_RETURN && lastKeyHit.hasFlags(0)) {
+		lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
+	// F7 is used to skip cutscenes in the Commodote 64 version of Maniac Mansion
+	} else if (_game.id == GID_MANIAC &&_game.platform == Common::kPlatformC64) {
+		if (lastKeyHit.keycode == Common::KEYCODE_F7 && lastKeyHit.hasFlags(0))
+			lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
+	// 'B' is used to skip cutscenes in the NES version of Maniac Mansion
+	} else if (_game.id == GID_MANIAC &&_game.platform == Common::kPlatformNES) {
+		if (lastKeyHit.keycode == Common::KEYCODE_b && lastKeyHit.hasFlags(Common::KBD_SHIFT))
+			lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
+	// 'F4' is used to skip cutscenes in the other versions of Maniac Mansion
+	} else if (_game.id == GID_MANIAC) {
+		if (lastKeyHit.keycode == Common::KEYCODE_F4 && lastKeyHit.hasFlags(0))
+			lastKeyHit = Common::KeyState(Common::KEYCODE_ESCAPE);
+	}
+
 	// Fall back to default behavior
 	ScummEngine::processKeyboard(lastKeyHit);
 






More information about the Scummvm-git-logs mailing list