mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-15 23:42:30 +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

123
retroarch.c
View File

@ -37682,78 +37682,78 @@ static enum runloop_state runloop_check_state(
#ifdef HAVE_CHEEVOS #ifdef HAVE_CHEEVOS
if (!rcheevos_hardcore_active()) if (!rcheevos_hardcore_active())
#endif #endif
{
/* Check if rewind toggle was being held. */
{
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
{ char s[128];
char s[128]; bool rewinding = false;
bool rewinding = false; unsigned t = 0;
unsigned t = 0;
s[0] = '\0'; s[0] = '\0';
rewinding = state_manager_check_rewind( rewinding = state_manager_check_rewind(
&p_rarch->rewind_st, &p_rarch->rewind_st,
BIT256_GET(current_bits, RARCH_REWIND), BIT256_GET(current_bits, RARCH_REWIND),
settings->uints.rewind_granularity, settings->uints.rewind_granularity,
p_rarch->runloop_paused, p_rarch->runloop_paused,
s, sizeof(s), &t); s, sizeof(s), &t);
#if defined(HAVE_GFX_WIDGETS) #if defined(HAVE_GFX_WIDGETS)
if (widgets_active) if (widgets_active)
p_rarch->gfx_widgets_rewinding = rewinding; p_rarch->gfx_widgets_rewinding = rewinding;
else else
#endif
{
if (rewinding)
runloop_msg_queue_push(s, 0, t, true, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
}
}
#endif
/* Checks if slowmotion toggle/hold was being pressed and/or held. */
#ifdef HAVE_CHEEVOS
if (!rcheevos_hardcore_active())
#endif
{
static bool old_slowmotion_button_state = false;
static bool old_slowmotion_hold_button_state = false;
bool new_slowmotion_button_state = BIT256_GET(
current_bits, RARCH_SLOWMOTION_KEY);
bool new_slowmotion_hold_button_state = BIT256_GET(
current_bits, RARCH_SLOWMOTION_HOLD_KEY);
if (new_slowmotion_button_state && !old_slowmotion_button_state)
p_rarch->runloop_slowmotion = !p_rarch->runloop_slowmotion;
else if (old_slowmotion_hold_button_state != new_slowmotion_hold_button_state)
p_rarch->runloop_slowmotion = new_slowmotion_hold_button_state;
if (p_rarch->runloop_slowmotion)
{
if (settings->uints.video_black_frame_insertion)
if (!p_rarch->runloop_idle)
video_driver_cached_frame();
#if defined(HAVE_GFX_WIDGETS)
if (!widgets_active)
#endif #endif
{ {
#ifdef HAVE_REWIND if (rewinding)
struct state_manager_rewind_state runloop_msg_queue_push(s, 0, t, true, NULL,
*rewind_st = &p_rarch->rewind_st;
if (rewind_st->frame_is_reversed)
runloop_msg_queue_push(
msg_hash_to_str(MSG_SLOW_MOTION_REWIND), 1, 1, false, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
else
#endif
runloop_msg_queue_push(
msg_hash_to_str(MSG_SLOW_MOTION), 1, 1, false,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }
#endif
} }
old_slowmotion_button_state = new_slowmotion_button_state; {
old_slowmotion_hold_button_state = new_slowmotion_hold_button_state; /* Checks if slowmotion toggle/hold was being pressed and/or held. */
static bool old_slowmotion_button_state = false;
static bool old_slowmotion_hold_button_state = false;
bool new_slowmotion_button_state = BIT256_GET(
current_bits, RARCH_SLOWMOTION_KEY);
bool new_slowmotion_hold_button_state = BIT256_GET(
current_bits, RARCH_SLOWMOTION_HOLD_KEY);
if (new_slowmotion_button_state && !old_slowmotion_button_state)
p_rarch->runloop_slowmotion = !p_rarch->runloop_slowmotion;
else if (old_slowmotion_hold_button_state != new_slowmotion_hold_button_state)
p_rarch->runloop_slowmotion = new_slowmotion_hold_button_state;
if (p_rarch->runloop_slowmotion)
{
if (settings->uints.video_black_frame_insertion)
if (!p_rarch->runloop_idle)
video_driver_cached_frame();
#if defined(HAVE_GFX_WIDGETS)
if (!widgets_active)
#endif
{
#ifdef HAVE_REWIND
struct state_manager_rewind_state
*rewind_st = &p_rarch->rewind_st;
if (rewind_st->frame_is_reversed)
runloop_msg_queue_push(
msg_hash_to_str(MSG_SLOW_MOTION_REWIND), 1, 1, false, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
else
#endif
runloop_msg_queue_push(
msg_hash_to_str(MSG_SLOW_MOTION), 1, 1, false,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
}
}
old_slowmotion_button_state = new_slowmotion_button_state;
old_slowmotion_hold_button_state = new_slowmotion_hold_button_state;
}
} }
/* Check movie record toggle */ /* Check movie record toggle */
@ -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)
{ {