summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorayuanx <ayuanx@gmail.com>2009-12-05 10:50:35 +0000
committerayuanx <ayuanx@gmail.com>2009-12-05 10:50:35 +0000
commit973441d7033318b4e62f00e42e7487db7a764e1a (patch)
treee094f8e185c43bee27a9384385958602b119a5d9 /Source
parent24a785af5936afd9e8939073763bcddc4407be2a (diff)
Revert "shake" to the previous fierce one. Yes, some games require you to shake as hard as you possibly can. So better keep shake always hard.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4643 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
index 1a5d63f34f..89e2744f3b 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp
@@ -444,20 +444,32 @@ void SingleShake(u8 &_x, u8 &_y, u8 &_z, int wm)
switch(Shake[wm])
{
case 1:
+ case 3:
_x = g_wm.cal_zero.x / 2;
_y = g_wm.cal_zero.y / 2;
_z = g_wm.cal_zero.z / 2;
break;
+ case 5:
+ case 7:
+ _x = (0xFF - g_wm.cal_zero.x ) / 2;
+ _y = (0xFF - g_wm.cal_zero.y ) / 2;
+ _z = (0xFF - g_wm.cal_zero.z ) / 2;
+ break;
case 2:
+ _x = 0x00;
+ _y = 0x00;
+ _z = 0x00;
+ break;
+ case 6:
+ _x = 0xFF;
+ _y = 0xFF;
+ _z = 0xFF;
+ break;
+ case 4:
_x = 0x80;
_y = 0x80;
_z = 0x80;
break;
- case 3:
- _x = (0xFF - g_wm.cal_zero.x ) / 2;
- _y = (0xFF - g_wm.cal_zero.y ) / 2;
- _z = (0xFF - g_wm.cal_zero.z ) / 2;
- break;
default:
Shake[wm] = -1;
_x = g_wm.cal_zero.x;