diff options
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/libretro.c | 14 | ||||
| -rw-r--r-- | frontend/plugin.c | 26 |
2 files changed, 19 insertions, 21 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c index 6e859c7..bdce90e 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -1312,8 +1312,7 @@ static void update_variables(bool in_flight) void retro_run(void) { - - int i; + int i; input_poll_cb(); @@ -1321,17 +1320,14 @@ 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]; - } - - //printf("%i : %i\n",i , input_state_cb(i, RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X)); if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD) { diff --git a/frontend/plugin.c b/frontend/plugin.c index 53ecac9..5663e6d 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -52,12 +52,13 @@ extern int CALLBACK SPUplayCDDAchannel(short *, int); static long PADreadPort1(PadDataS *pad, int pad_index) { pad->controllerType = in_type[pad_index]; pad->buttonStatus = ~in_keystate[pad_index]; - if(multitap1==1){ - pad->portMultitap=1; - }else{ - pad->portMultitap=0; - } - if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) { + if (multitap1 == 1) + pad->portMultitap = 1; + else + pad->portMultitap = 0; + + if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) + { pad->leftJoyX = in_analog_left[pad_index][0]; pad->leftJoyY = in_analog_left[pad_index][1]; pad->rightJoyX = in_analog_right[pad_index][0]; @@ -74,12 +75,13 @@ static long PADreadPort2(PadDataS *pad, int pad_index) { pad->controllerType = in_type[pad_index]; pad->buttonStatus = ~in_keystate[pad_index]; - if(multitap2==1){ - pad->portMultitap=2; - }else{ - pad->portMultitap=0; - } - if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) { + if (multitap2 ==1 ) + pad->portMultitap = 2; + else + pad->portMultitap = 0; + + if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON) + { pad->leftJoyX = in_analog_left[pad_index][0]; pad->leftJoyY = in_analog_left[pad_index][1]; pad->rightJoyX = in_analog_right[pad_index][0]; |