diff --git a/runtime/input.c b/runtime/input.c index 08cea46c..70acfef7 100644 --- a/runtime/input.c +++ b/runtime/input.c @@ -861,7 +861,8 @@ void input_poll(uint64_t *buttons, int32_t *lx, int32_t *ly, int32_t *rx, int32_ poll_merged(buttons, lx, ly, rx, ry); // While quick load drives the game's load menu the pointer leaves it alone and the game gets only its presses if (!g_block && !g_menu && !quicksave_busy()) menu_cursor_poll(buttons); - if (!g_block && !g_menu && quicksave_poll(buttons, lx, ly, rx, ry)) return; + // A quick load under way goes on while the settings menu or a text entry opens: the held picture ends with it + if ((quicksave_busy() || (!g_block && !g_menu)) && quicksave_poll(buttons, lx, ly, rx, ry)) return; const int32_t axes[4] = {*lx, *ly, *rx, *ry}; int text = blocked(&g_block, &g_block_closed, "text entry", *buttons, axes), menu = blocked(&g_menu, &g_menu_closed, "menu", *buttons, axes); diff --git a/runtime/quicksave.c b/runtime/quicksave.c index bd8c4ded..008d111a 100644 --- a/runtime/quicksave.c +++ b/runtime/quicksave.c @@ -91,8 +91,11 @@ int quicksave_on(void) { static int on; unsigned v = cfg_version(); if (v == seen) return on; - int was = on; - seen = v, on = RT_V143 && cfg_bool("TOTK_QUICKSAVE"); + int was = on, want = cfg_bool("TOTK_QUICKSAVE"); + static int told; + seen = v, on = RT_V143 && want; + // The game's addresses below are 1.4.3's: on 1.1.0 and 1.2.1 the setting is refused once, and no call is made + if (want && !RT_V143 && !told) told = 1, rt_log("quicksave: game 1.4.3 only; quick save and quick load stay off"); if (!on) return 0; int s = key_setting("TOTK_QUICKSAVE_KEY", "quicksave_key"), l = key_setting("TOTK_QUICKLOAD_KEY", "quickload_key"); if (l == s && l != KEY_NONE) {