From 1cb3fe75211355ae52242a2349873b419cf092fe Mon Sep 17 00:00:00 2001 From: hrydgard Date: Thu, 2 Jul 2009 23:36:15 +0000 Subject: [PATCH] Map middle mouse button to shake, to make Galaxy a bit more playable without my wiimote (too lazy to fetch it :p) also fix build. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3655 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_DSP_LLE/Src/main.cpp | 2 +- Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp index 11b8dc8a98..918649be76 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_LLE/Src/main.cpp @@ -206,7 +206,7 @@ void Initialize(void *init) std::string irom_filename = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + DSP_IROM; std::string coef_filename = File::GetSysDirectory() + GC_SYS_DIR + DIR_SEP + DSP_COEF; - bCanWork = DSPCore_Init(irom_filename.c_str(), coef_filename.c_str(), &g_dspInitialize); + bCanWork = DSPCore_Init(irom_filename.c_str(), coef_filename.c_str()); g_dsp.cpu_ram = g_dspInitialize.pGetMemoryPointer(0); DSPCore_Reset(); diff --git a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp index 885cc632bf..1aa9e5072c 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/FillReport.cpp @@ -337,7 +337,7 @@ int IsKey(int Key) case g_Wm.D: return GetAsyncKeyState(PadMapping[0].Wm.D); case g_Wm.PITCH_L: return GetAsyncKeyState(PadMapping[0].Wm.PitchL); case g_Wm.PITCH_R: return GetAsyncKeyState(PadMapping[0].Wm.PitchR); - case g_Wm.SHAKE: return GetAsyncKeyState(PadMapping[0].Wm.Shake); + case g_Wm.SHAKE: return GetAsyncKeyState(PadMapping[0].Wm.Shake) || GetAsyncKeyState(VK_MBUTTON); // Nunchuck case g_Nc.Z: return GetAsyncKeyState(PadMapping[0].Nc.Z);