[Scummvm-cvs-logs] SF.net SVN: scummvm: [30145] scummvm/branches/branch-0-11-0/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 30145
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30145&view=rev
Author:   Kirben
Date:     2008-01-02 03:31:21 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
Backport fixes for Maniac Mansion (C64).

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/scumm/input.cpp
    scummvm/branches/branch-0-11-0/engines/scumm/verbs.cpp

Modified: scummvm/branches/branch-0-11-0/engines/scumm/input.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/scumm/input.cpp	2008-01-02 11:25:17 UTC (rev 30144)
+++ scummvm/branches/branch-0-11-0/engines/scumm/input.cpp	2008-01-02 11:31:21 UTC (rev 30145)
@@ -495,7 +495,8 @@
 		abortCutscene();
 
 		// FIXME: Is the following line really necessary?
-		_mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY);
+		if (VAR_CUTSCENEEXIT_KEY != 0xFF)
+			_mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY);
 
 	} else if (lastKeyHit.ascii == '[' || lastKeyHit.ascii == ']') { // Change music volume
 		int vol = ConfMan.getInt("music_volume") / 16;

Modified: scummvm/branches/branch-0-11-0/engines/scumm/verbs.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/scumm/verbs.cpp	2008-01-02 11:25:17 UTC (rev 30144)
+++ scummvm/branches/branch-0-11-0/engines/scumm/verbs.cpp	2008-01-02 11:31:21 UTC (rev 30145)
@@ -70,7 +70,7 @@
 // FIXME: Replace * with the correct character
 static const VerbSettings v0VerbTable_German[] = {
 	{ 1,  0, 1,   0, "Ziehe"},
-	{ 2,  0, 0,   0, "Dr[cke"},
+	{ 2,  0, 0,   0, "Dr<cke"},
 	{ 3,  7, 2,   4, "Lese"},
 	{ 4, 23, 0,   0, "Schlie*e auf"},
 	{ 5, 37, 1,   0, "Ein"},
@@ -80,7 +80,7 @@
 	{ 9,  7, 1,   0, "Nimm"},
 	{10,  0, 2,   0, "Gebe"},
 	{11, 23, 1, 255, "Repariere"},
-	{12,  7, 0,   0, "}ffne"},
+	{12,  7, 0,   0, "$ffne"},
 	{13, 13, 0,   0, "Gehe zu"},
 	{14, 13, 2,   0, "Was ist"},
 	{15, 23, 2,   0, "Benutz"}


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