Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow skipping credits for the port #564

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Allow skipping credits for the port #564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/game/credits.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
#include "lib/vi.h"
#include "data.h"
#include "types.h"
#ifndef PLATFORM_N64
#include "input.h"
#endif

/**
* Credits
Expand Down Expand Up @@ -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;
Expand Down
Loading