From 3ef8024697bb41d4a54058a6005fbae08b9b22da Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Fri, 28 Aug 2020 20:08:46 -0400 Subject: [PATCH] Make the intro shorter as I felt it was a bit too long Change the code a bit so less magic numbers. --- src/f_finale.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/f_finale.c b/src/f_finale.c index d56869897..71c7c3784 100644 --- a/src/f_finale.c +++ b/src/f_finale.c @@ -315,7 +315,7 @@ const char *introtext[NUMINTROSCENES]; static tic_t introscenetime[NUMINTROSCENES] = { - 7*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... @@ -621,14 +621,14 @@ static void F_IntroDrawScene(void) } else if (intro_scenenum == 0) // STJr presents { - if (intro_curtime > 1 && intro_curtime < 278) + if (intro_curtime > 1 && intro_curtime < introscenetime[intro_scenenum]) { V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); - if (intro_curtime < 30) // Make the text shine! + if (intro_curtime < TICRATE-5) // Make the text shine! sprintf(stjrintro, "STJRI%03u", intro_curtime-1); - else if (intro_curtime >= 29 && intro_curtime < 50) // Pause on black screen for just a second + else if (intro_curtime >= TICRATE-6 && intro_curtime < 2*TICRATE-20) // Pause on black screen for just a second return; - else if (intro_curtime == 51) + else if (intro_curtime == 2*TICRATE-19) { // Fade in the text // The text fade out is automatically handled when switching to a new intro scene