From 721b9b004efb3e5d0a4bbf6a567b376ba6d7fea8 Mon Sep 17 00:00:00 2001 From: Matthew Coppola Date: Sat, 21 Dec 2024 05:02:14 -0500 Subject: [PATCH] Allow skipping credits for the port --- src/game/credits.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/game/credits.c b/src/game/credits.c index e47cca554..f95fbdf96 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -24,6 +24,9 @@ #include "lib/vi.h" #include "data.h" #include "types.h" +#ifndef PLATFORM_N64 +#include "input.h" +#endif /** * Credits @@ -1876,11 +1879,22 @@ Gfx *creditsDraw(Gfx *gdl) } } - // Exit the alternative title if a button is pressed (other than L or R) +#ifdef PLATFORM_N64 #if VERSION >= VERSION_NTSC_1_0 + // Exit the alternative title if a button is pressed (other than L or R) if (g_CreditsUsingAltTitle && joyGetButtonsPressedThisFrame(0, 0xffcf)) #else if (g_CreditsUsingAltTitle && joyGetButtons(0, 0xffff)) +#endif +#else +#if VERSION >= VERSION_NTSC_1_0 + // Exit to CI if a button is pressed (other than L or R), for the port + if (joyGetButtonsPressedThisFrame(0, 0xffcf) || + inputKeyJustPressed(VK_ESCAPE)) +#else + if (joyGetButtons(0, 0xffff) || + inputKeyJustPressed(VK_ESCAPE)) +#endif #endif { g_TitleNextStage = STAGE_CITRAINING;