stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-28 07:02:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge branch 'quick-intro' into 'next'"

Browse source 
This reverts merge request !2132
This commit is contained in:
sphere 2024-06-25 12:17:40 +00:00
parent 86d6919606
commit cd5a6ddeb4
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_main.c
View file

@ -298,8 +298,8 @@ void D_ProcessEvents(void)
// added comment : there is a wipe eatch change of the gamestate // added comment : there is a wipe eatch change of the gamestate
gamestate_t wipegamestate = GS_LEVEL; gamestate_t wipegamestate = GS_LEVEL;
// -1: Default; 0-n: Wipe index; INT16_MAX: do not wipe // -1: Default; 0-n: Wipe index; INT16_MAX: do not wipe
INT16 wipetypepre = INT16_MAX; INT16 wipetypepre = -1;
INT16 wipetypepost = INT16_MAX; INT16 wipetypepost = -1;
static void D_Display(void) static void D_Display(void)
{ {
@ -749,8 +749,6 @@ void D_SRB2Loop(void)
// hack to start on a nice clear console screen. // hack to start on a nice clear console screen.
COM_ImmedExecute("cls;version"); 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 I_FinishUpdate(); // page flip or blit buffer
/* /*

12
src/f_finale.c
View file

@ -313,7 +313,7 @@ const char *introtext[NUMINTROSCENES];
static tic_t introscenetime[NUMINTROSCENES] = static tic_t introscenetime[NUMINTROSCENES] =
{ {
6*TICRATE, // STJr Presents 5*TICRATE, // STJr Presents
10*TICRATE + (TICRATE/2), // Two months had passed since... 10*TICRATE + (TICRATE/2), // Two months had passed since...
12*TICRATE + ((TICRATE/4) * 3), // As it was about to drain the rings... 12*TICRATE + ((TICRATE/4) * 3), // As it was about to drain the rings...
12*TICRATE + (TICRATE/4), // What Sonic, Tails, and Knuckles... 12*TICRATE + (TICRATE/4), // What Sonic, Tails, and Knuckles...
@ -623,15 +623,15 @@ void F_IntroDrawer(void)
{ {
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
if (intro_curtime > TICRATE-17 && intro_curtime < 2*TICRATE-22) // Make the text shine! if (intro_curtime < TICRATE-5) // Make the text shine!
{ {
sprintf(stjrintro, "STJRI%03u", intro_curtime-19); sprintf(stjrintro, "STJRI%03u", intro_curtime-1);
} }
else if (intro_curtime >= 2*TICRATE-23 && intro_curtime < 2*TICRATE-3) // 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; return;
} }
else if (intro_curtime == 2*TICRATE-2) else if (intro_curtime == 2*TICRATE-19)
{ {
// Fade in the text // Fade in the text
// The text fade out is automatically handled when switching to a new intro scene // The text fade out is automatically handled when switching to a new intro scene
@ -950,7 +950,7 @@ void F_IntroTicker(void)
if (rendermode != render_none) if (rendermode != render_none)
{ {
if (intro_scenenum == 0 && intro_curtime == 2*TICRATE-2) if (intro_scenenum == 0 && intro_curtime == 2*TICRATE-19)
{ {
S_ChangeMusicInternal("_stjr", false); S_ChangeMusicInternal("_stjr", false);