[Scummvm-cvs-logs] SF.net SVN: scummvm: [25601] scummvm/trunk/engines/scumm/script_v2.cpp

[fingolfin at users.sourceforge.net]

Revision: 25601
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25601&view=rev
Author:   fingolfin
Date:     2007-02-15 02:40:20 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
Fix for bug #1328146: MANIACNES: Shortcut keys are incorrectly configured

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/script_v2.cpp

Modified: scummvm/trunk/engines/scumm/script_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v2.cpp	2007-02-15 10:30:30 UTC (rev 25600)
+++ scummvm/trunk/engines/scumm/script_v2.cpp	2007-02-15 10:40:20 UTC (rev 25601)
@@ -861,16 +861,26 @@
 		vs->curRect.left = x;
 		vs->curRect.top = y;
 
-		// FIXME: again, this map depends on the language of the game.
+		// FIXME: these keyboard map depends on the language of the game.
 		// E.g. a german keyboard has 'z' and 'y' swapped, while a french
 		// keyboard starts with "awert", etc.
-		const char keyboard[] = {
-				'q','w','e','r','t',
-				'a','s','d','f','g',
-				'z','x','c','v','b'
-			};
-		if (1 <= slot && slot <= ARRAYSIZE(keyboard))
-			vs->key = keyboard[slot - 1];
+		if (_game.platform == Common::kPlatformNES) {
+			static const char keyboard[] = {
+					'q','w','e','r',
+					'a','s','d','f',
+					'z','x','c','v'
+				};
+			if (1 <= slot && slot <= ARRAYSIZE(keyboard))
+				vs->key = keyboard[slot - 1];
+		} else {
+			static const char keyboard[] = {
+					'q','w','e','r','t',
+					'a','s','d','f','g',
+					'z','x','c','v','b'
+				};
+			if (1 <= slot && slot <= ARRAYSIZE(keyboard))
+				vs->key = keyboard[slot - 1];
+		}
 
 		// It follows the verb name
 		loadPtrToResource(rtVerb, slot, NULL);


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