X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=bdce90ee1a9f2579d1ec58ac26d9914d4886a5a3;hb=e288923db915ae8e0facd2fe0be8ed866b4f2373;hp=4486b958aeeba1577db3a89df8b17d4613bfadd9;hpb=ace14ab3172ad90809a3cc5e8fe67d5cac9e294b;p=pcsx_rearmed.git

diff --git a/frontend/libretro.c b/frontend/libretro.c
index 4486b958..bdce90ee 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -54,12 +54,15 @@ extern char Mcd1Data[MCD_SIZE];
 extern char McdDisable[2];
 
 /* PCSX ReARMed core calls and stuff */
-int in_type[8];
+int in_type[8] =  { PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+                  PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+                  PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+                  PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD };
 int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }};
 unsigned short in_keystate[8];
-int multitap1;
-int multitap2;
+int multitap1 = 0;
+int multitap2 = 0;
 int in_enable_vibration = 1;
 
 /* PSX max resolution is 640x512, but with enhancement it's 1024x512 */
@@ -1309,8 +1312,7 @@ static void update_variables(bool in_flight)
 
 void retro_run(void)
 {
-
-   int i;
+    int i;
 
 	input_poll_cb();
 
@@ -1318,31 +1320,22 @@ void retro_run(void)
 	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
 		update_variables(true);
 
-	// reset all keystate, query from libretro for keystate
+	// reset all keystate, query libretro for keystate
 	int j;
-	for(i=0;i<8;i++){
+	for(i = 0; i < 8; i++) {
 		in_keystate[i] = 0;
-		// query from libretro for keystate
-		for (j = 0; j < RETRO_PSX_MAP_LEN; j++){
+		// query libretro for keystate
+		for (j = 0; j < RETRO_PSX_MAP_LEN; j++)
 			if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j))
 				in_keystate[i] |= retro_psx_map[j];
-		}
-	}
 
-	if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD)
-	{
-		in_analog_left[0][0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_left[0][1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-		in_analog_right[0][0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_right[0][1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-	}
-
-	if (in_type[1] == PSE_PAD_TYPE_ANALOGPAD)
-	{
-		in_analog_left[1][0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_left[1][1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
-		in_analog_right[1][0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-		in_analog_right[1][1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+		if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD)
+		{
+			in_analog_left[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+			in_analog_left[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+			in_analog_right[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+			in_analog_right[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+		}
 	}
 
 	stop = 0;