X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=3374141ed89b7f2dc77e9055fa3a157bd132fbc4;hb=ab88daca6f1367543d88b35e04a7999f3e36a0ff;hp=2c95a67aff2bcca22c7607925c7136c420e0a0f9;hpb=2db412ade2b09ca04da81d91b75bbf6475dbde5a;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 2c95a67a..3374141e 100644
--- 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),