attempt to improve guncon defaults

[pcsx_rearmed.git] / frontend / plugin.c

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 2c95a67..3374141 100644 (file)
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -74,10 +74,7 @@ static long CALLBACK PADreadPort1(PadDataS *pad) {
        pad->controllerType = in_type[pad_index];
        pad->buttonStatus = ~in_keystate[pad_index];
 
-       if (multitap1 == 1)
-               pad->portMultitap = 1;
-       else
-               pad->portMultitap = 0;
+       pad->portMultitap = multitap1;
 
        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)
        {
@@ -105,10 +102,7 @@ static long CALLBACK PADreadPort2(PadDataS *pad) {
        pad->controllerType = in_type[pad_index];
        pad->buttonStatus = ~in_keystate[pad_index];
 
-       if (multitap2 == 1)
-               pad->portMultitap = 2;
-       else
-               pad->portMultitap = 0;
+       pad->portMultitap = multitap2;
 
        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)
        {
@@ -145,6 +139,7 @@ extern long GPUdmaChain(uint32_t *,uint32_t);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);
 extern void GPUvBlank(int, int);
+extern void GPUgetScreenInfo(int *y, int *base_hres);
 extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
 
 
@@ -228,6 +223,7 @@ static const struct {
        DIRECT_GPU(GPUdmaChain),
        DIRECT_GPU(GPUfreeze),
        DIRECT_GPU(GPUvBlank),
+       DIRECT_GPU(GPUgetScreenInfo),
        DIRECT_GPU(GPUrearmedCallbacks),
 
        DIRECT_GPU(GPUdisplayText),