libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Bump up max players to 16

Browse Source
This commit is contained in:
twinaphex 2014-09-04 16:15:34 +02:00
parent b8df671bd9
commit 514e454f16
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.def.h
View File

@ -604,7 +604,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
{ true, RARCH_MENU_TOGGLE, RETRO_LBL_MENU_TOGGLE, RETROK_F1, NO_BTN, 0, AXIS_NONE },
};
// Player 2-5
// Players 2 to MAX_PLAYERS
static const struct retro_keybind retro_keybinds_rest[] = {
// | RetroPad button | desc | keyboard key | js btn | js axis |
{ true, RETRO_DEVICE_ID_JOYPAD_B, RETRO_LBL_JOYPAD_B, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },

2
driver_menu.h
View File

@ -32,7 +32,7 @@ extern "C" {
#define MENU_MAX_HATS 4
#ifndef MAX_PLAYERS
#define MAX_PLAYERS 8
#define MAX_PLAYERS 16
#endif
struct menu_bind_state_port

2
general.h
View File

@ -88,7 +88,7 @@
extern "C" {
#endif
#define MAX_PLAYERS 8
#define MAX_PLAYERS 16
enum basic_event
{

8
input/input_common.c
View File

@ -999,6 +999,14 @@ static const char *bind_player_prefix[MAX_PLAYERS] = {
"input_player6",
"input_player7",
"input_player8",
"input_player9",
"input_player10",
"input_player11",
"input_player12",
"input_player13",
"input_player14",
"input_player15",
"input_player16",
};
#define DECLARE_BIND(x, bind, desc) { true, 0, #x, desc, bind }

16
retroarch.c
View File

@ -839,6 +839,14 @@ static int16_t input_state(unsigned port, unsigned device,
g_settings.input.binds[5],
g_settings.input.binds[6],
g_settings.input.binds[7],
g_settings.input.binds[8],
g_settings.input.binds[9],
g_settings.input.binds[10],
g_settings.input.binds[11],
g_settings.input.binds[12],
g_settings.input.binds[13],
g_settings.input.binds[14],
g_settings.input.binds[15],
};
if (!driver.block_libretro_input && (id < RARCH_FIRST_META_KEY ||
@ -2516,6 +2524,14 @@ static void check_turbo(void)
g_settings.input.binds[5],
g_settings.input.binds[6],
g_settings.input.binds[7],
g_settings.input.binds[8],
g_settings.input.binds[9],
g_settings.input.binds[10],
g_settings.input.binds[11],
g_settings.input.binds[12],
g_settings.input.binds[13],
g_settings.input.binds[14],
g_settings.input.binds[15],
};
g_extern.turbo_count++;