defaut dualshock to digital again, unless overriden

[pcsx_rearmed.git] / libpcsxcore / plugins.c

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 868493b..75e1f5f 100644 (file)
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -490,15 +490,8 @@ static void initBufForRequest(int padIndex, char value) {
                return;
        }
 
-       // switch to analog mode automatically after the game finishes init
-       if (value == 0x42 && pads[padIndex].ds.padMode == 0)
-               pads[padIndex].ds.digitalModeFrames++;
-       if (pads[padIndex].ds.digitalModeFrames == 60*4) {
-               pads[padIndex].ds.padMode = 1;
-               pads[padIndex].ds.digitalModeFrames = 0;
-       }
-
-       if ((u32)(frame_counter - pads[padIndex].ds.lastUseFrame) > 60u)
+       if ((u32)(frame_counter - pads[padIndex].ds.lastUseFrame) > 60u
+           && !Config.hacks.dualshock_init_analog)
                pads[padIndex].ds.padMode = 0; // according to nocash
        pads[padIndex].ds.lastUseFrame = frame_counter;
 
@@ -622,6 +615,15 @@ static void log_pad(int port, int pos)
 #endif
 }
 
+static void adjust_analog(unsigned char *b)
+{
+       // ff8 hates 0x80 for whatever reason (broken in 2d area menus),
+       // or is this caused by something else we do wrong??
+       // Also S.C.A.R.S. treats 0x7f as turning left.
+       if (b[6] == 0x7f || b[6] == 0x80)
+               b[6] = 0x81;
+}
+
 // Build response for 0x42 request Pad in port
 static void PADstartPoll_(PadDataS *pad) {
        switch (pad->controllerType) {
@@ -699,6 +701,7 @@ static void PADstartPoll_(PadDataS *pad) {
                        stdpar[5] = pad->rightJoyY;
                        stdpar[6] = pad->leftJoyX;
                        stdpar[7] = pad->leftJoyY;
+                       adjust_analog(stdpar);
                        memcpy(buf, stdpar, 8);
                        respSize = 8;
                        break;
@@ -711,6 +714,7 @@ static void PADstartPoll_(PadDataS *pad) {
                        stdpar[5] = pad->rightJoyY;
                        stdpar[6] = pad->leftJoyX;
                        stdpar[7] = pad->leftJoyY;
+                       adjust_analog(stdpar);
                        memcpy(buf, stdpar, 8);
                        respSize = 8;
                        break;
@@ -980,6 +984,15 @@ int padFreeze(void *f, int Mode) {
        return 0;
 }
 
+int padToggleAnalog(unsigned int index)
+{
+       int r = -1;
+
+       if (index < sizeof(pads) / sizeof(pads[0]))
+               r = (pads[index].ds.padMode ^= 1);
+       return r;
+}
+
 
 void *hNETDriver = NULL;