mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 17:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't have two consecutive rcheevos_hardcore_active boolean

Browse Source 
conditionals - have only one instead
This commit is contained in:
twinaphex 2021-03-07 17:59:01 +01:00
parent 69bae76ec3
commit 8328043897
1 changed files with 61 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroarch.c
View File

@ -37682,8 +37682,10 @@ static enum runloop_state runloop_check_state(
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
if (!rcheevos_hardcore_active()) if (!rcheevos_hardcore_active())
#endif #endif
#ifdef HAVE_REWIND
{ {
/* Check if rewind toggle was being held. */
{
#ifdef HAVE_REWIND
char s[128]; char s[128];
bool rewinding = false; bool rewinding = false;
unsigned t = 0; unsigned t = 0;
@ -37707,14 +37709,11 @@ static enum runloop_state runloop_check_state(
runloop_msg_queue_push(s, 0, t, true, NULL, runloop_msg_queue_push(s, 0, t, true, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }
#endif
} }
#endif
/* Checks if slowmotion toggle/hold was being pressed and/or held. */
#ifdef HAVE_CHEEVOS
if (!rcheevos_hardcore_active())
#endif
{ {
/* Checks if slowmotion toggle/hold was being pressed and/or held. */
static bool old_slowmotion_button_state = false; static bool old_slowmotion_button_state = false;
static bool old_slowmotion_hold_button_state = false; static bool old_slowmotion_hold_button_state = false;
bool new_slowmotion_button_state = BIT256_GET( bool new_slowmotion_button_state = BIT256_GET(
@ -37755,6 +37754,7 @@ static enum runloop_state runloop_check_state(
old_slowmotion_button_state = new_slowmotion_button_state; old_slowmotion_button_state = new_slowmotion_button_state;
old_slowmotion_hold_button_state = new_slowmotion_hold_button_state; old_slowmotion_hold_button_state = new_slowmotion_hold_button_state;
} }
}
/* Check movie record toggle */ /* Check movie record toggle */
HOTKEY_CHECK(RARCH_BSV_RECORD_TOGGLE, CMD_EVENT_BSV_RECORDING_TOGGLE, true, NULL); HOTKEY_CHECK(RARCH_BSV_RECORD_TOGGLE, CMD_EVENT_BSV_RECORDING_TOGGLE, true, NULL);
@ -37778,7 +37778,6 @@ static enum runloop_state runloop_check_state(
RARCH_CHEAT_INDEX_MINUS, CMD_EVENT_CHEAT_INDEX_MINUS, RARCH_CHEAT_INDEX_MINUS, CMD_EVENT_CHEAT_INDEX_MINUS,
RARCH_CHEAT_TOGGLE, CMD_EVENT_CHEAT_TOGGLE); RARCH_CHEAT_TOGGLE, CMD_EVENT_CHEAT_TOGGLE);
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
if (settings->bools.video_shader_watch_files) if (settings->bools.video_shader_watch_files)
{ {