summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorStelios Tsampas <loathingkernel@gmail.com>2017-07-28 13:13:09 +0300
committerStelios Tsampas <loathingkernel@gmail.com>2017-07-28 13:13:09 +0300
commitb117a70fd03d780b5817c635d5c337c6ecc36d94 (patch)
treed25ec5b0d3c55f9ad4cce14b325326333d0a680d /plugins
parentdb51fade6de9461e7a139da2bf5887a9a6569506 (diff)
* Plugin.c: Add PGXP visual debug binding (F11)
* GtkGui.c: Fix path saving in file selection dialog * LnxMain.c: Don't look for bios in data directory
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/dfinput/pad.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index 8861ec4d..f413d0a4 100755
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -125,9 +125,7 @@ long PADopen(unsigned long *Disp) {
}
#if SDL_VERSION_ATLEAST(2,0,0)
- SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
- if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1)
- return PSE_PAD_ERR_FAILURE;
+ SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
has_haptic = 0;
if (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0)
@@ -497,7 +495,7 @@ unsigned char PADpoll(unsigned char value) {
if (buf == NULL) {
return 0;
}
-
+
switch (CurCmd) {
case CMD_READ_DATA_AND_VIBRATE:
if (g.cfg.PadDef[CurPad].Type == PSE_PAD_TYPE_ANALOGPAD) {
@@ -516,7 +514,7 @@ unsigned char PADpoll(unsigned char value) {
if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1])) {
//gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
}
-
+
if(gpuVisualVibration != NULL &&
g.cfg.PadDef[CurPad].VisualVibration) {
gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);