[Scummvm-cvs-logs] SF.net SVN: scummvm:[43118] scummvm/branches/branch-1-0-0

[dhewg at users.sourceforge.net]

Revision: 43118
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43118&view=rev
Author:   dhewg
Date:     2009-08-08 11:31:27 +0000 (Sat, 08 Aug 2009)

Log Message:
-----------
backport of r43117.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/platform/wii/osystem_events.cpp
    scummvm/branches/branch-1-0-0/dists/wii/READMII

Modified: scummvm/branches/branch-1-0-0/backends/platform/wii/osystem_events.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wii/osystem_events.cpp	2009-08-08 11:30:56 UTC (rev 43117)
+++ scummvm/branches/branch-1-0-0/backends/platform/wii/osystem_events.cpp	2009-08-08 11:31:27 UTC (rev 43118)
@@ -316,20 +316,28 @@
 #endif
 
 	if (bd || bu) {
-		PAD_EVENT(PADS_Z, Common::KEYCODE_RETURN, Common::ASCII_RETURN, 0);
-		PAD_EVENT(PADS_X, Common::KEYCODE_ESCAPE, Common::ASCII_ESCAPE, 0);
-		PAD_EVENT(PADS_Y, Common::KEYCODE_PERIOD, '.', 0);
-		PAD_EVENT(PADS_START, Common::KEYCODE_F5, Common::ASCII_F5, 0);
-		PAD_EVENT(PADS_UP, Common::KEYCODE_F5, Common::ASCII_F5, Common::KBD_CTRL);
-		PAD_EVENT(PADS_DOWN, Common::KEYCODE_F7, Common::ASCII_F7, 0);
-		//PAD_EVENT(PADS_LEFT, Common::KEYCODE_F8, Common::ASCII_F8, 0);
+		byte flags = 0;
 
+		if (bh & PADS_UP) {
+			PAD_EVENT(PADS_START, Common::KEYCODE_F5, Common::ASCII_F5, Common::KBD_CTRL);
+
+			flags = Common::KBD_SHIFT;
+		}
+
 		if (bd & PADS_RIGHT) {
 			event.type = Common::EVENT_PREDICTIVE_DIALOG;
 
 			return true;
 		}
 
+		PAD_EVENT(PADS_Z, Common::KEYCODE_RETURN, Common::ASCII_RETURN, flags);
+		PAD_EVENT(PADS_X, Common::KEYCODE_ESCAPE, Common::ASCII_ESCAPE, flags);
+		PAD_EVENT(PADS_Y, Common::KEYCODE_PERIOD, '.', flags);
+		PAD_EVENT(PADS_START, Common::KEYCODE_F5, Common::ASCII_F5, flags);
+		PAD_EVENT(PADS_UP, Common::KEYCODE_LSHIFT, 0, flags);
+		PAD_EVENT(PADS_DOWN, Common::KEYCODE_F7, Common::ASCII_F7, flags);
+		//PAD_EVENT(PADS_LEFT, Common::KEYCODE_F8, Common::ASCII_F8, 0);
+
 		if ((bd | bu) & (PADS_A | PADS_B)) {
 			if (bd & PADS_A)
 				event.type = Common::EVENT_LBUTTONDOWN;

Modified: scummvm/branches/branch-1-0-0/dists/wii/READMII
===================================================================
--- scummvm/branches/branch-1-0-0/dists/wii/READMII	2009-08-08 11:30:56 UTC (rev 43117)
+++ scummvm/branches/branch-1-0-0/dists/wii/READMII	2009-08-08 11:31:27 UTC (rev 43118)
@@ -44,10 +44,9 @@
     plus: "." (skip current line of text)
     2: enter
     home: f5 (scummvm menu)
-    dpad up: shift (mass add for the gui)
-    dpad down: "0"
-    dpad left: "y"
-    dpad right: "n"
+    dpad up: shift (mass add for the gui, combined with home: GMM)
+    dpad down: virtual keyboard
+    dpad right: predictive dialog (only in AGI games)
 
   gamecube pad
 
@@ -58,10 +57,9 @@
     y: "." (skip current line of text)
     z: enter
     start: f5 (scummvm menu)
-    dpad up: shift (mass add for the gui)
-    dpad down: "0"
-    dpad left: "y"
-    dpad right: "n"
+    dpad up: shift (mass add for the gui, combined with start: GMM)
+    dpad down: virtual keyboard
+    dpad right: predictive dialog (only in AGI games)
 
 DISPLAY SETUP
 


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