Merge pull request #542 from gameblabla/mdec_fix

[pcsx_rearmed.git] / frontend / plugin.c

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 53ecac9..a617c24 100644 (file)
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -49,43 +49,66 @@ extern void CALLBACK SPUasync(unsigned int, unsigned int);
 extern int  CALLBACK SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad, int pad_index) {
-    pad->controllerType = in_type[pad_index];
-    pad->buttonStatus = ~in_keystate[pad_index];
-    if(multitap1==1){
-       pad->portMultitap=1;
-    }else{
-       pad->portMultitap=0;
-    }
-    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
-        pad->leftJoyX = in_analog_left[pad_index][0];
-        pad->leftJoyY = in_analog_left[pad_index][1];
-        pad->rightJoyX = in_analog_right[pad_index][0];
-        pad->rightJoyY = in_analog_right[pad_index][1];
-    }
-    return 0;
+static long PADreadPort1(PadDataS *pad) {
+       int pad_index = pad->requestPadIndex;
+
+       pad->controllerType = in_type[pad_index];
+       pad->buttonStatus = ~in_keystate[pad_index];
+
+       if (multitap1 == 1)
+               pad->portMultitap = 1;
+       else
+               pad->portMultitap = 0;
+
+       if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+       {
+               pad->leftJoyX = in_analog_left[pad_index][0];
+               pad->leftJoyY = in_analog_left[pad_index][1];
+               pad->rightJoyX = in_analog_right[pad_index][0];
+               pad->rightJoyY = in_analog_right[pad_index][1];
+
+               pad->absoluteX = in_analog_left[pad_index][0];
+               pad->absoluteY = in_analog_left[pad_index][1];
+       }
+
+       if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+       {
+               pad->moveX = in_mouse[pad_index][0];
+               pad->moveY = in_mouse[pad_index][1];
+       }
+
+       return 0;
 }
 
-static long PADreadPort2(PadDataS *pad, int pad_index) {
-    /* Temporary hack to avoid segfault when pad_index is a crazy number */
-    if (pad_index <= 1 || pad_index > 8) {
-        pad_index = 1;
-    }
-
-    pad->controllerType = in_type[pad_index];
-    pad->buttonStatus = ~in_keystate[pad_index];
-    if(multitap2==1){
-       pad->portMultitap=2;
-    }else{
-       pad->portMultitap=0;
-    }
-    if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) {
-        pad->leftJoyX = in_analog_left[pad_index][0];
-        pad->leftJoyY = in_analog_left[pad_index][1];
-        pad->rightJoyX = in_analog_right[pad_index][0];
-        pad->rightJoyY = in_analog_right[pad_index][1];
-    }
-    return 0;
+static long PADreadPort2(PadDataS *pad) {
+       int pad_index = pad->requestPadIndex;
+
+       pad->controllerType = in_type[pad_index];
+       pad->buttonStatus = ~in_keystate[pad_index];
+
+       if (multitap2 == 1)
+               pad->portMultitap = 2;
+       else
+               pad->portMultitap = 0;
+
+       if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+       {
+               pad->leftJoyX = in_analog_left[pad_index][0];
+               pad->leftJoyY = in_analog_left[pad_index][1];
+               pad->rightJoyX = in_analog_right[pad_index][0];
+               pad->rightJoyY = in_analog_right[pad_index][1];
+
+               pad->absoluteX = in_analog_left[pad_index][0];
+               pad->absoluteY = in_analog_left[pad_index][1];
+       }
+
+       if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+       {
+               pad->moveX = in_mouse[pad_index][0];
+               pad->moveY = in_mouse[pad_index][1];
+       }
+
+       return 0;
 }
 
 /* GPU */