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

More gracefully amend Splits/Attackstart data on ghost load rather than splits load

Browse source
This commit is contained in:
toaster 2025-08-21 18:25:15 +01:00
parent be3c0faf7e
commit a52411b552
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/g_demo.cpp
View file

@ -1316,7 +1316,7 @@ void G_GhostTicker(void)
continue; continue;
} }
// Pause jhosts that cross until the timer starts. // Pause jhosts that cross until the timer starts.
if (g->attackstart != INT32_MAX && leveltime < starttime && leveltime >= g->attackstart && G_TimeAttackStart()) if (g->attackstart != UINT32_MAX && leveltime < starttime && leveltime >= g->attackstart && G_TimeAttackStart())
{ {
continue; continue;
} }
@ -1664,10 +1664,10 @@ 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 && attacktimingstarted && g->attackstart != INT32_MAX && leveltime < g->attackstart && G_TimeAttackStart()) if (!fastforward && attacktimingstarted && g->attackstart != UINT32_MAX && leveltime < g->attackstart && G_TimeAttackStart())
{ {
fastforward = g->attackstart - leveltime; fastforward = g->attackstart - leveltime;
g->attackstart = INT32_MAX; g->attackstart = UINT32_MAX;
} }
if (fastforward) if (fastforward)
@ -2144,7 +2144,7 @@ void G_BeginRecording(void)
// If special attack-start timing applies, we need to know where to skip the ghost to // If special attack-start timing applies, we need to know where to skip the ghost to
demoattack_p = demobuf.p; demoattack_p = demobuf.p;
WRITEUINT32(demobuf.p, INT32_MAX); WRITEUINT32(demobuf.p, UINT32_MAX);
demosplits_p = demobuf.p; demosplits_p = demobuf.p;
for (i = 0; i < MAXSPLITS; i++) for (i = 0; i < MAXSPLITS; i++)
@ -2363,10 +2363,6 @@ void G_SetDemoCheckpointTiming(player_t *player, tic_t time, UINT8 checkpoint)
if (points <= MAXSPLITS) if (points <= MAXSPLITS)
endtime = g->splits[points-1]; endtime = g->splits[points-1];
// Staff ghost oopsie. Fuckin, uh,
if (endtime == INT32_MAX)
endtime = UINT32_MAX;
if (lowestend > oldbest) // Not losing to any ghost if (lowestend > oldbest) // Not losing to any ghost
{ {
// Not currently losing to a ghost // Not currently losing to a ghost
@ -3670,6 +3666,21 @@ void G_AddGhost(savebuffer_t *buffer, const char *defdemoname)
splits[i] = READUINT32(p); splits[i] = READUINT32(p);
} }
if (ghostversion < 0x0010)
{
// Staff ghost oopsie. Fuckin, uh,
if (attackstart == INT32_MAX)
attackstart = UINT32_MAX;
for (i = 0; i < MAXSPLITS; i++)
{
if (splits[i] != INT32_MAX)
continue;
splits[i] = UINT32_MAX;
}
}
// net var data // net var data
count = READUINT16(p); count = READUINT16(p);
while (count--) while (count--)