diff options
| author | Andre Heider | 2009-08-08 11:30:56 +0000 | 
|---|---|---|
| committer | Andre Heider | 2009-08-08 11:30:56 +0000 | 
| commit | 14574b0d81fb9711d9601f9beb5ecba06c599174 (patch) | |
| tree | 7a74d3672dbe6aac694d045cad0a315a4c04914c | |
| parent | 4f5e8e88cca8643cba1d155e1cbf4067c22d7bf1 (diff) | |
| download | scummvm-rg350-14574b0d81fb9711d9601f9beb5ecba06c599174.tar.gz scummvm-rg350-14574b0d81fb9711d9601f9beb5ecba06c599174.tar.bz2 scummvm-rg350-14574b0d81fb9711d9601f9beb5ecba06c599174.zip | |
tweaked the mapped keys to reintroduce SHIFT for mass adding games
svn-id: r43117
| -rw-r--r-- | backends/platform/wii/osystem_events.cpp | 22 | ||||
| -rw-r--r-- | dists/wii/READMII | 14 | 
2 files changed, 21 insertions, 15 deletions
| diff --git a/backends/platform/wii/osystem_events.cpp b/backends/platform/wii/osystem_events.cpp index f28e5b547b..0967db1625 100644 --- a/backends/platform/wii/osystem_events.cpp +++ b/backends/platform/wii/osystem_events.cpp @@ -316,13 +316,13 @@ bool OSystem_Wii::pollEvent(Common::Event &event) {  #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; @@ -330,6 +330,14 @@ bool OSystem_Wii::pollEvent(Common::Event &event) {  			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; diff --git a/dists/wii/READMII b/dists/wii/READMII index b9460a9863..32f97b5425 100644 --- a/dists/wii/READMII +++ b/dists/wii/READMII @@ -44,10 +44,9 @@ CONTROLS      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 @@ CONTROLS      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 | 
