diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-09 20:49:54 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-09 20:49:54 +0000 |
| commit | 4d55a8b8254dff61fdc7b1959f6aef7eafbd9439 (patch) | |
| tree | fb5e56131a7c8b729641c70e7a87883ebaea5186 /plugins/dfinput | |
| parent | 71d6c56271e2650b1a2f5149521a5b1896084710 (diff) | |
| download | pcsxr-4d55a8b8254dff61fdc7b1959f6aef7eafbd9439.tar.gz | |
Patch 10767 (Durandal_1707).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72138 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfinput')
| -rw-r--r-- | plugins/dfinput/analog.c | 4 | ||||
| -rw-r--r-- | plugins/dfinput/sdljoy.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/dfinput/analog.c b/plugins/dfinput/analog.c index 8d14b00b..7d70e24a 100644 --- a/plugins/dfinput/analog.c +++ b/plugins/dfinput/analog.c @@ -28,8 +28,8 @@ void InitAnalog() { g.PadState[1].AnalogStatus[ANALOG_RIGHT][0] = 127; g.PadState[1].AnalogStatus[ANALOG_RIGHT][1] = 127; - memset(g.PadState[0].AnalogKeyStatus, 0, sizeof(g.PadState[0].AnalogKeyStatus)); - memset(g.PadState[1].AnalogKeyStatus, 0, sizeof(g.PadState[1].AnalogKeyStatus)); + memset((void *)g.PadState[0].AnalogKeyStatus, 0, sizeof(g.PadState[0].AnalogKeyStatus)); + memset((void *)g.PadState[1].AnalogKeyStatus, 0, sizeof(g.PadState[1].AnalogKeyStatus)); } void CheckAnalog() { diff --git a/plugins/dfinput/sdljoy.c b/plugins/dfinput/sdljoy.c index 7111d90b..4351d8a4 100644 --- a/plugins/dfinput/sdljoy.c +++ b/plugins/dfinput/sdljoy.c @@ -19,14 +19,14 @@ #include "pad.h" #if SDL_VERSION_ATLEAST(1,3,0) -static SDL_HapticEffect haptic_rumbleEffect; +//static SDL_HapticEffect haptic_rumbleEffect; #endif void JoyInitHaptic() { #if SDL_VERSION_ATLEAST(1,3,0) uint8_t i; - unsigned int haptic_query = 0; + //unsigned int haptic_query = 0; for (i = 0; i < 2; i++) { if (g.PadState[i].JoyDev && SDL_JoystickIsHaptic(g.PadState[i].JoyDev)) |