libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-11-30 12:20:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #485 from hiddenasbestos/dynamic_port_count

Browse Source 
Dynamic controller port count reporting
This commit is contained in:
Twinaphex 2019-02-03 19:05:57 +01:00 committed by GitHub
commit 5359198531
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
input.cpp
View File

@ -11,7 +11,7 @@
// Locals
//------------------------------------------------------------------------------
static retro_environment_t environ_cb; // cached during input_set_env
static retro_environment_t environ_cb; // cached during input_init_env
static retro_rumble_interface rumble; // acquired during input_init_env
static FrontIO* FIO; // cached in input_set_fio
@ -95,6 +95,35 @@ static const struct retro_controller_description input_device_types[ INPUT_DEVIC
{ NULL, 0 },
};
static const struct retro_controller_info ports8[ 8 + 1 ] =
{
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ 0 },
};
static const struct retro_controller_info ports5[ 5 + 1 ] =
{
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ 0 },
};
static const struct retro_controller_info ports2[ 2 + 1 ] =
{
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ 0 },
};
//------------------------------------------------------------------------------
@ -400,20 +429,23 @@ void input_init_env( retro_environment_t _environ_cb )
void input_set_env( retro_environment_t environ_cb )
{
static const struct retro_controller_info ports[ MAX_CONTROLLERS + 1 ] =
switch ( players )
{
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ input_device_types, INPUT_DEVICE_TYPES_COUNT },
{ 0 },
};
environ_cb( RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports );
case 8:
environ_cb( RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports8 );
break;
case 5:
environ_cb( RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports5 );
break;
default:
case 2:
environ_cb( RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports2 );
break;
} /* switch ( players ) */
}
void input_init()
@ -450,6 +482,8 @@ void input_enable_calibration( bool enable )
void input_set_player_count( unsigned _players )
{
players = _players;
input_set_env( environ_cb );
}
void input_set_mouse_sensitivity( int percent )

2
libretro.cpp
View File

@ -3055,7 +3055,7 @@ static void check_variables(bool startup)
if(setting_psx_multitap_port_1 && setting_psx_multitap_port_2)
input_set_player_count( 8 );
else if (setting_psx_multitap_port_1 || setting_psx_multitap_port_2)
input_set_player_count( 4 );
input_set_player_count( 5 );
else
input_set_player_count( 2 );