ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Can't have hardcoded binds structs for 8 players

This commit is contained in:
twinaphex 2013-03-16 17:33:18 +01:00
parent c26653fca8
commit 2579af2764
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
retroarch.c
View File

@ -538,13 +538,27 @@ static int16_t input_state(unsigned port, unsigned device, unsigned index, unsig
static const struct retro_keybind *binds[MAX_PLAYERS] = { static const struct retro_keybind *binds[MAX_PLAYERS] = {
g_settings.input.binds[0], g_settings.input.binds[0],
#if MAX_PADS > 1
g_settings.input.binds[1], g_settings.input.binds[1],
#endif
#if MAX_PADS > 2
g_settings.input.binds[2], g_settings.input.binds[2],
#endif
#if MAX_PADS > 3
g_settings.input.binds[3], g_settings.input.binds[3],
#endif
#if MAX_PADS > 4
g_settings.input.binds[4], g_settings.input.binds[4],
#endif
#if MAX_PADS > 5
g_settings.input.binds[5], g_settings.input.binds[5],
#endif
#if MAX_PADS > 6
g_settings.input.binds[6], g_settings.input.binds[6],
#endif
#if MAX_PADS > 7
g_settings.input.binds[7], g_settings.input.binds[7],
#endif
}; };
int16_t res = 0; int16_t res = 0;
@ -2289,13 +2303,27 @@ static void check_turbo(void)
static const struct retro_keybind *binds[MAX_PLAYERS] = { static const struct retro_keybind *binds[MAX_PLAYERS] = {
g_settings.input.binds[0], g_settings.input.binds[0],
#if MAX_PADS > 1
g_settings.input.binds[1], g_settings.input.binds[1],
#endif
#if MAX_PADS > 2
g_settings.input.binds[2], g_settings.input.binds[2],
#endif
#if MAX_PADS > 3
g_settings.input.binds[3], g_settings.input.binds[3],
#endif
#if MAX_PADS > 4
g_settings.input.binds[4], g_settings.input.binds[4],
#endif
#if MAX_PADS > 5
g_settings.input.binds[5], g_settings.input.binds[5],
#endif
#if MAX_PADS > 6
g_settings.input.binds[6], g_settings.input.binds[6],
#endif
#if MAX_PADS > 7
g_settings.input.binds[7], g_settings.input.binds[7],
#endif
}; };
for (unsigned i = 0; i < MAX_PLAYERS; i++) for (unsigned i = 0; i < MAX_PLAYERS; i++)

15
settings.c
View File

@ -839,14 +839,27 @@ static const struct bind_map bind_maps[MAX_PLAYERS][RARCH_BIND_LIST_END_NULL] =
DECLARE_BIND(disk_next, RARCH_DISK_NEXT), DECLARE_BIND(disk_next, RARCH_DISK_NEXT),
DECLARE_BIND(menu_toggle, RARCH_MENU_TOGGLE), DECLARE_BIND(menu_toggle, RARCH_MENU_TOGGLE),
}, },
#if MAX_PADS > 1
{ DECL_PLAYER(2) }, { DECL_PLAYER(2) },
#endif
#if MAX_PADS > 2
{ DECL_PLAYER(3) }, { DECL_PLAYER(3) },
#endif
#if MAX_PADS > 3
{ DECL_PLAYER(4) }, { DECL_PLAYER(4) },
#endif
#if MAX_PADS > 4
{ DECL_PLAYER(5) }, { DECL_PLAYER(5) },
#endif
#if MAX_PADS > 5
{ DECL_PLAYER(6) }, { DECL_PLAYER(6) },
#endif
#if MAX_PADS > 6
{ DECL_PLAYER(7) }, { DECL_PLAYER(7) },
#endif
#if MAX_PADS > 7
{ DECL_PLAYER(8) }, { DECL_PLAYER(8) },
#endif
}; };
struct key_map struct key_map