libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2025-02-11 12:05:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

only poll the number of pads we need depending on multitap settings

Browse Source
This commit is contained in:
AndresSM 2014-08-16 15:32:37 -05:00
parent 25618a51fd
commit ce5eef73b8
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libretro.cpp
View File

@ -19,8 +19,8 @@ static retro_audio_sample_batch_t audio_batch_cb;
static retro_environment_t environ_cb;
static retro_input_poll_t input_poll_cb;
static retro_input_state_t input_state_cb;
static retro_rumble_interface rumble;
static unsigned players = 2;
/* start of Mednafen psx.cpp */
@ -2372,6 +2372,21 @@ static void check_variables(void)
{
setting_last_scanline_pal = atoi(var.value);
}
if(setting_psx_multitap_port_1)
{
if(setting_psx_multitap_port_2)
players = 8;
else
players = 4;
}
else
{
if(setting_psx_multitap_port_2)
players = 4;
else
players = 2;
}
}
#ifdef NEED_CD
@ -2652,7 +2667,7 @@ bool retro_load_game(const struct retro_game_info *info)
//SetInput(0, "gamepad", &input_buf[0]);
//SetInput(1, "gamepad", &input_buf[1]);
for (unsigned i = 0; i < MAX_PLAYERS; i++)
for (unsigned i = 0; i < players; i++)
{
SetInput(i, "gamepad", &input_buf[i]);
}
@ -2692,7 +2707,7 @@ static void update_input(void)
//input_buf[0] = 0;
//input_buf[1] = 0;
for (unsigned j = 0; j < MAX_PLAYERS; j++)
for (unsigned j = 0; j < players; j++)
{
input_buf[j] = 0;
}
@ -2716,7 +2731,7 @@ static void update_input(void)
RETRO_DEVICE_ID_JOYPAD_Y,
};
for (unsigned j = 0; j < MAX_PLAYERS; j++)
for (unsigned j = 0; j < players; j++)
{
for (unsigned i = 0; i < MAX_BUTTONS; i++)
input_buf[j] |= input_state_cb(j, RETRO_DEVICE_JOYPAD, 0, map[i]) ? (1 << i) : 0;
@ -2728,14 +2743,14 @@ static void update_input(void)
//buf.u8[1][0] = (input_buf[1] >> 0) & 0xff;
//buf.u8[1][1] = (input_buf[1] >> 8) & 0xff;
for (unsigned j = 0; j < MAX_PLAYERS; j++)
for (unsigned j = 0; j < players; j++)
{
buf.u8[j][0] = (input_buf[j] >> 0) & 0xff;
buf.u8[j][1] = (input_buf[j] >> 8) & 0xff;
}
// Analogs
for (unsigned j = 0; j < MAX_PLAYERS; j++)
for (unsigned j = 0; j < players; j++)
{
int analog_left_x = input_state_cb(j, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT,
RETRO_DEVICE_ID_ANALOG_X);
@ -2779,7 +2794,7 @@ static void update_input(void)
//rumble.set_rumble_state(1, RETRO_RUMBLE_WEAK, buf.u8[1][9 * 4] * 0x101);
//rumble.set_rumble_state(1, RETRO_RUMBLE_STRONG, buf.u8[1][9 * 4 + 1] * 0x101);
for (unsigned j = 0; j < MAX_PLAYERS; j++)
for (unsigned j = 0; j < players; j++)
{
rumble.set_rumble_state(j, RETRO_RUMBLE_WEAK, buf.u8[j][9 * 4] * 0x101);
rumble.set_rumble_state(j, RETRO_RUMBLE_STRONG, buf.u8[j][9 * 4 + 1] * 0x101);