diff --git a/src/d_main.c b/src/d_main.c index 19d0b8a87..72a0475bf 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -297,7 +297,7 @@ static void D_Display(void) // set for all later wipedefindex = gamestate; // wipe_xxx_toblack if (gamestate == GS_TITLESCREEN && wipegamestate != GS_INTRO) - wipedefindex = wipe_multinter_toblack; + wipedefindex = wipe_timeattack_toblack; else if (gamestate == GS_INTERMISSION) { if (intertype == int_spec) // Special Stage diff --git a/src/k_kart.c b/src/k_kart.c index 7a87f6803..ac3647715 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -4590,7 +4590,7 @@ static void K_drawKartTimestamp(void) if (cv_timelimit.value && timelimitintics > 0) { - if (drawtime > timelimitintics) + if (drawtime >= timelimitintics) drawtime = 0; else drawtime = timelimitintics - drawtime; diff --git a/src/y_inter.c b/src/y_inter.c index 352689ca1..f89ec24c6 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -537,9 +537,7 @@ void Y_Ticker(void) if (intertype == int_race || intertype == int_match) { - if (modeattacking) - endtic = intertic + 8*TICRATE; // 8 second pause after end of tally - else if (netgame || multiplayer) + if (netgame || multiplayer) { if (sorttic == -1) sorttic = intertic + max((cv_inttime.value/2)-2, 2)*TICRATE; // 8 second pause after match results @@ -573,6 +571,8 @@ void Y_Ticker(void) } } } + else + endtic = intertic + 8*TICRATE; // 8 second pause after end of tally } }