From 68ad3a1c627ac47ba2a19fe0b0d2ec38b443d3af Mon Sep 17 00:00:00 2001 From: spherallic Date: Fri, 1 Sep 2023 02:53:08 +0200 Subject: [PATCH 1/2] 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 24c70843a..6e17af258 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 11ea909e9..c592c69bb 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); From 8dce0e1a3f58c5f5d77cd227bc6f92ebfded5f0c Mon Sep 17 00:00:00 2001 From: spherallic Date: Tue, 12 Mar 2024 17:29:08 +0100 Subject: [PATCH 2/2] Prevent white flash upon starting the game (in Software) --- src/d_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/d_main.c b/src/d_main.c index 46e64267e..41c8e6336 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -749,6 +749,8 @@ void D_SRB2Loop(void) // hack to start on a nice clear console screen. COM_ImmedExecute("cls;version"); + // hack to prevent white flash upon initial window resize + V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,31); I_FinishUpdate(); // page flip or blit buffer /*