thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Review fixup

Browse source
This commit is contained in:
Antonio Martinez 2025-08-06 16:48:20 -04:00
parent 49c5318261
commit bf8511c495
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomstat.h
View file

@ -884,7 +884,7 @@ extern boolean thwompsactive;
extern UINT8 lastLowestLap; extern UINT8 lastLowestLap;
extern SINT8 spbplace; extern SINT8 spbplace;
extern boolean rainbowstartavailable; extern boolean rainbowstartavailable;
extern tic_t linecrossed; extern tic_t attacktimingstarted;
extern boolean inDuel; extern boolean inDuel;
extern UINT8 overtimecheckpoints; extern UINT8 overtimecheckpoints;

5
src/g_demo.cpp
View file

@ -1250,12 +1250,11 @@ void G_GhostTicker(void)
{ {
demoghost *g,*p; demoghost *g,*p;
tic_t fastforward = 0;
for (g = ghosts, p = NULL; g; g = g->next) for (g = ghosts, p = NULL; g; g = g->next)
{ {
UINT16 ziptic; UINT16 ziptic;
UINT8 xziptic; UINT8 xziptic;
tic_t fastforward = 0;
if (g->done) 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 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 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; fastforward = g->attackstart - leveltime;
g->attackstart = INT32_MAX; g->attackstart = INT32_MAX;

4
src/g_game.c
View file

@ -314,7 +314,7 @@ boolean thwompsactive; // Thwomps activate on lap 2
UINT8 lastLowestLap; // Last lowest lap, for activating race lap executors UINT8 lastLowestLap; // Last lowest lap, for activating race lap executors
SINT8 spbplace; // SPB exists, give the person behind better items SINT8 spbplace; // SPB exists, give the person behind better items
boolean rainbowstartavailable; // Boolean, keeps track of if the rainbow start was gotten 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 boolean inDuel; // Boolean, keeps track of if it is a 1v1
UINT8 overtimecheckpoints; // Duel overtime speedups! UINT8 overtimecheckpoints; // Duel overtime speedups!
@ -5130,7 +5130,7 @@ void G_EndGame(void)
return; return;
} }
if (gametype == GT_TUTORIAL && M_GameAboutToStart() && restoreMenu == NULL) if (gametype == GT_TUTORIAL && M_GameAboutToStart() && restoreMenu == NULL)
{ {
// Playground Hack // Playground Hack
F_StartIntro(); F_StartIntro();

6
src/k_kart.c
View file

@ -192,7 +192,7 @@ void K_TimerReset(void)
memset(&g_musicfade, 0, sizeof g_musicfade); memset(&g_musicfade, 0, sizeof g_musicfade);
numbulbs = 1; numbulbs = 1;
inDuel = rainbowstartavailable = false; inDuel = rainbowstartavailable = false;
linecrossed = 0; attacktimingstarted = 0;
overtimecheckpoints = 0; overtimecheckpoints = 0;
timelimitintics = extratimeintics = secretextratime = 0; timelimitintics = extratimeintics = secretextratime = 0;
g_pointlimit = 0; g_pointlimit = 0;
@ -9631,9 +9631,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
K_DropItems(player); 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 if (starttime > leveltime) // Overlong starts shouldn't reset time on cross
{ {