From 68ad3a1c627ac47ba2a19fe0b0d2ec38b443d3af Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Fri, 1 Sep 2023 02:53:08 +0200
Subject: [PATCH] STJr intro tweaks: - Disable initial fade from startup screen
- Add half-second pauses at the start and end
---
src/d_main.c | 4 ++--
src/f_finale.c | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/d_main.c b/src/d_main.c
index 24c70843a3..6e17af2587 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -297,8 +297,8 @@ void D_ProcessEvents(void)
// added comment : there is a wipe eatch change of the gamestate
gamestate_t wipegamestate = GS_LEVEL;
// -1: Default; 0-n: Wipe index; INT16_MAX: do not wipe
-INT16 wipetypepre = -1;
-INT16 wipetypepost = -1;
+INT16 wipetypepre = INT16_MAX;
+INT16 wipetypepost = INT16_MAX;
static void D_Display(void)
{
diff --git a/src/f_finale.c b/src/f_finale.c
index 11ea909e94..c592c69bb3 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -312,7 +312,7 @@ const char *introtext[NUMINTROSCENES];
static tic_t introscenetime[NUMINTROSCENES] =
{
- 5*TICRATE, // STJr Presents
+ 6*TICRATE, // STJr Presents
11*TICRATE + (TICRATE/2), // Two months had passed since...
15*TICRATE + (TICRATE/2), // As it was about to drain the rings...
14*TICRATE, // What Sonic, Tails, and Knuckles...
@@ -622,15 +622,15 @@ void F_IntroDrawer(void)
{
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
- if (intro_curtime < TICRATE-5) // Make the text shine!
+ if (intro_curtime > TICRATE-17 && intro_curtime < 2*TICRATE-22) // Make the text shine!
{
- sprintf(stjrintro, "STJRI%03u", intro_curtime-1);
+ sprintf(stjrintro, "STJRI%03u", intro_curtime-19);
}
- else if (intro_curtime >= TICRATE-6 && intro_curtime < 2*TICRATE-20) // Pause on black screen for just a second
+ else if (intro_curtime >= 2*TICRATE-23 && intro_curtime < 2*TICRATE-3) // Pause on black screen for just a second
{
return;
}
- else if (intro_curtime == 2*TICRATE-19)
+ else if (intro_curtime == 2*TICRATE-2)
{
// Fade in the text
// The text fade out is automatically handled when switching to a new intro scene
@@ -949,7 +949,7 @@ void F_IntroTicker(void)
if (rendermode != render_none)
{
- if (intro_scenenum == 0 && intro_curtime == 2*TICRATE-19)
+ if (intro_scenenum == 0 && intro_curtime == 2*TICRATE-2)
{
S_ChangeMusicInternal("_stjr", false);
--
GitLab