diff --git a/src/doomstat.h b/src/doomstat.h index 9a8efea18..e585a5db3 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -884,7 +884,7 @@ extern boolean thwompsactive; extern UINT8 lastLowestLap; extern SINT8 spbplace; extern boolean rainbowstartavailable; -extern tic_t linecrossed; +extern tic_t attacktimingstarted; extern boolean inDuel; extern UINT8 overtimecheckpoints; diff --git a/src/g_demo.cpp b/src/g_demo.cpp index 89c35fc0e..7a3d91004 100644 --- a/src/g_demo.cpp +++ b/src/g_demo.cpp @@ -1250,12 +1250,11 @@ void G_GhostTicker(void) { demoghost *g,*p; - tic_t fastforward = 0; - for (g = ghosts, p = NULL; g; g = g->next) { UINT16 ziptic; UINT8 xziptic; + tic_t fastforward = 0; if (g->done) { @@ -1599,7 +1598,7 @@ skippedghosttic: I_Error("Ghost is not a record attack ghost GHOSTEND"); //@TODO lmao don't blow up like this // If the timer started, skip ahead until the ghost starts too. - if (!fastforward && linecrossed && g->attackstart != INT32_MAX && leveltime < g->attackstart && G_TimeAttackStart()) + if (!fastforward && attacktimingstarted && g->attackstart != INT32_MAX && leveltime < g->attackstart && G_TimeAttackStart()) { fastforward = g->attackstart - leveltime; g->attackstart = INT32_MAX; diff --git a/src/g_game.c b/src/g_game.c index e59199a08..ef2cb3218 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -314,7 +314,7 @@ boolean thwompsactive; // Thwomps activate on lap 2 UINT8 lastLowestLap; // Last lowest lap, for activating race lap executors SINT8 spbplace; // SPB exists, give the person behind better items boolean rainbowstartavailable; // Boolean, keeps track of if the rainbow start was gotten -tic_t linecrossed; // For Time Attack +tic_t attacktimingstarted; // For Time Attack boolean inDuel; // Boolean, keeps track of if it is a 1v1 UINT8 overtimecheckpoints; // Duel overtime speedups! @@ -5130,7 +5130,7 @@ void G_EndGame(void) return; } - if (gametype == GT_TUTORIAL && M_GameAboutToStart() && restoreMenu == NULL) + if (gametype == GT_TUTORIAL && M_GameAboutToStart() && restoreMenu == NULL) { // Playground Hack F_StartIntro(); diff --git a/src/k_kart.c b/src/k_kart.c index dc8eec7f7..bbabb5051 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -192,7 +192,7 @@ void K_TimerReset(void) memset(&g_musicfade, 0, sizeof g_musicfade); numbulbs = 1; inDuel = rainbowstartavailable = false; - linecrossed = 0; + attacktimingstarted = 0; overtimecheckpoints = 0; timelimitintics = extratimeintics = secretextratime = 0; g_pointlimit = 0; @@ -9631,9 +9631,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) K_DropItems(player); } - if (G_TimeAttackStart() && !linecrossed && player->speed && leveltime > introtime) + if (G_TimeAttackStart() && !attacktimingstarted && player->speed && leveltime > introtime) { - linecrossed = leveltime; + attacktimingstarted = leveltime; /* if (starttime > leveltime) // Overlong starts shouldn't reset time on cross {