diff --git a/src/f_wipe.c b/src/f_wipe.c index 9399598f5..ddc719e6d 100644 --- a/src/f_wipe.c +++ b/src/f_wipe.c @@ -415,7 +415,7 @@ void F_WipeStageTitle(void) if ((WipeStageTitle) && G_IsTitleCardAvailable()) { ST_runTitleCard(); - ST_drawWipeTitleCard(); + ST_drawTitleCard(); } } diff --git a/src/g_game.c b/src/g_game.c index df2fbb931..580b3bf0d 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1310,26 +1310,27 @@ void G_StartTitleCard(void) void G_PreLevelTitleCard(void) { #ifndef NOWIPE - tic_t strtime = I_GetTime(); - tic_t endtime = strtime + (PRELEVELTIME*NEWTICRATERATIO); - tic_t nowtime = strtime; - tic_t lasttime = strtime; - while (nowtime < endtime) - { - // draw loop - while (!((nowtime = I_GetTime()) - lasttime)) - I_Sleep(); - lasttime = nowtime; + tic_t strtime = I_GetTime(); + tic_t endtime = strtime + (PRELEVELTIME*NEWTICRATERATIO); + tic_t nowtime = strtime; + tic_t lasttime = strtime; + while (nowtime < endtime) + { + // draw loop + ST_runTitleCard(); + ST_preLevelTitleCardDrawer(); + I_FinishUpdate(); // page flip or blit buffer + NetKeepAlive(); // Prevent timeouts - ST_runTitleCard(); - ST_drawTitleCard(); - I_FinishUpdate(); // page flip or blit buffer + if (moviemode) + M_SaveFrame(); + if (takescreenshot) // Only take screenshots after drawing. + M_DoScreenShot(); - if (moviemode) - M_SaveFrame(); - if (takescreenshot) // Only take screenshots after drawing. - M_DoScreenShot(); - } + while (!((nowtime = I_GetTime()) - lasttime)) + I_Sleep(); + lasttime = nowtime; + } #endif } diff --git a/src/st_stuff.c b/src/st_stuff.c index 493d1b128..ee03a07a4 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -950,7 +950,7 @@ void ST_drawTitleCard(void) // Avoid HOMs while drawing the start of the titlecard if (lt_ticker < TTANIMSTART) - V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); + V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); // Background zig-zags V_DrawFixedPatch((chev1x)*FRACUNIT, (chev1y)*FRACUNIT, FRACUNIT, chevtflag, tcchev1, NULL); @@ -1055,20 +1055,11 @@ void ST_preLevelTitleCardDrawer(void) { V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, levelfadecol); - ST_drawWipeTitleCard(); + ST_drawTitleCard(); I_OsPolling(); I_UpdateNoBlit(); } -// -// Draw the title card while on a wipe. -// Also used in G_PreLevelTitleCard. -// -void ST_drawWipeTitleCard(void) -{ - ST_drawTitleCard(); -} - // // Draw the status bar overlay, customisable: the user chooses which // kind of information to overlay diff --git a/src/st_stuff.h b/src/st_stuff.h index cc771c053..a17f72c1f 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -64,7 +64,6 @@ void ST_runTitleCard(void); void ST_drawTitleCard(void); void ST_preDrawTitleCard(void); void ST_preLevelTitleCardDrawer(void); -void ST_drawWipeTitleCard(void); extern tic_t lt_ticker, lt_lasttic; extern tic_t lt_exitticker, lt_endtime;