X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=33efbf0be3876d1ac7273c383294632c93cedf6a;hp=c11a1f05a793589d1cda9273ca57bf7a7a53673f;hb=799b0b8773d6add1de99efd582c93701b82e970d;hpb=c89cd762a63a78e30a59955e705e29ff3d5ae3b8

diff --git a/frontend/plugin.c b/frontend/plugin.c
index c11a1f05..33efbf0b 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -43,15 +43,21 @@ extern void SPUplayCDDAchannel(short *, int);
 /* PAD */
 static long PADreadPort1(PadDataS *pad)
 {
-	pad->controllerType = PSE_PAD_TYPE_STANDARD;
-	pad->buttonStatus = ~keystate;
+	pad->controllerType = in_type;
+	pad->buttonStatus = ~in_keystate;
+	if (in_type == PSE_PAD_TYPE_ANALOGPAD) {
+		pad->leftJoyX = in_a1[0];
+		pad->leftJoyY = in_a1[1];
+		pad->rightJoyX = in_a2[0];
+		pad->rightJoyY = in_a2[1];
+	}
 	return 0;
 }
 
 static long PADreadPort2(PadDataS *pad)
 {
 	pad->controllerType = PSE_PAD_TYPE_STANDARD;
-	pad->buttonStatus = ~keystate >> 16;
+	pad->buttonStatus = ~in_keystate >> 16;
 	return 0;
 }