mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 10:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2020-06-06 19:36:46 +02:00
parent d98a0e2dce
commit cd42d02020
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
retroarch.c
View File

@ -2487,6 +2487,11 @@ static void retroarch_core_options_intl_init(
static void ui_companion_driver_toggle(struct rarch_state *p_rarch, static void ui_companion_driver_toggle(struct rarch_state *p_rarch,
bool force); bool force);
#ifdef HAVE_ACCESSIBILITY
static void set_gamepad_input_override(struct rarch_state *p_rarch,
unsigned i, bool val);
#endif
#ifdef HAVE_LIBNX #ifdef HAVE_LIBNX
void libnx_apply_overclock(void); void libnx_apply_overclock(void);
#endif #endif
@ -33188,12 +33193,13 @@ static enum runloop_state runloop_check_state(
if (settings->bools.ai_service_enable) if (settings->bools.ai_service_enable)
{ {
unsigned i; unsigned i;
reset_gamepad_input_override();
p_rarch->gamepad_input_override = 0;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
if (p_rarch->ai_gamepad_state[i] == 2) if (p_rarch->ai_gamepad_state[i] == 2)
set_gamepad_input_override(i, true); set_gamepad_input_override(p_rarch, i, true);
p_rarch->ai_gamepad_state[i] = 0; p_rarch->ai_gamepad_state[i] = 0;
} }
} }
@ -34937,21 +34943,14 @@ unsigned get_gamepad_input_override(void)
return p_rarch->gamepad_input_override; return p_rarch->gamepad_input_override;
} }
void set_gamepad_input_override(unsigned i, bool val) static void set_gamepad_input_override(struct rarch_state *p_rarch,
unsigned i, bool val)
{ {
struct rarch_state *p_rarch = &rarch_st;
if (val) if (val)
p_rarch->gamepad_input_override = p_rarch->gamepad_input_override | (1 << i); p_rarch->gamepad_input_override = p_rarch->gamepad_input_override | (1 << i);
else else
p_rarch->gamepad_input_override = p_rarch->gamepad_input_override & ((1 << i) ^ (~0)); p_rarch->gamepad_input_override = p_rarch->gamepad_input_override & ((1 << i) ^ (~0));
} }
void reset_gamepad_input_override(void)
{
struct rarch_state *p_rarch = &rarch_st;
p_rarch->gamepad_input_override = 0;
}
#endif #endif
/* creates folder and core options stub file for subsequent runs */ /* creates folder and core options stub file for subsequent runs */

4
retroarch.h
View File

@ -1989,9 +1989,7 @@ bool create_folder_and_core_options(void);
/* Input overrides */ /* Input overrides */
extern unsigned get_gamepad_input_override(void); unsigned get_gamepad_input_override(void);
extern void set_gamepad_input_override(unsigned i, bool val);
extern void reset_gamepad_input_override(void);
RETRO_END_DECLS RETRO_END_DECLS