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

Revert item capsule respawn queue changes

Browse source
This commit is contained in:
lachablock 2021-06-21 11:42:02 +10:00
parent 65204d951c
commit 8f93cdbb6b
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/p_mobj.c
View file

@ -10169,17 +10169,6 @@ void P_RespawnSpecials(void)
//if (!(gametyperules & GTR_CIRCUIT) && numgotboxes >= (4*nummapboxes/5)) // Battle Mode respawns all boxes in a different way //if (!(gametyperules & GTR_CIRCUIT) && numgotboxes >= (4*nummapboxes/5)) // Battle Mode respawns all boxes in a different way
//P_RespawnBattleBoxes(); //P_RespawnBattleBoxes();
// nothing left to respawn?
if (iquehead == iquetail)
return;
mthing = itemrespawnque[iquetail];
#ifdef PARANOIA
if (!mthing)
I_Error("itemrespawnque[iquetail] is NULL!");
#endif
// wait time depends on player count // wait time depends on player count
for (p = 0; p < MAXPLAYERS; p++) for (p = 0; p < MAXPLAYERS; p++)
{ {
@ -10214,10 +10203,6 @@ void P_RespawnSpecials(void)
&& !(mapheaderinfo[gamemap-1]->levelflags & LF_SECTIONRACE)) && !(mapheaderinfo[gamemap-1]->levelflags & LF_SECTIONRACE))
time = (time * 3) / max(1, mapheaderinfo[gamemap-1]->numlaps); time = (time * 3) / max(1, mapheaderinfo[gamemap-1]->numlaps);
// this should probably be a flag if multiple items end up using this
if (mthing && mthing->type == mobjinfo[MT_ITEMCAPSULE].doomednum)
time /= 2;
if (time < 10*TICRATE) if (time < 10*TICRATE)
{ {
// Ensure it doesn't go into absurdly low values // Ensure it doesn't go into absurdly low values
@ -10226,10 +10211,21 @@ void P_RespawnSpecials(void)
} }
} }
// nothing left to respawn?
if (iquehead == iquetail)
return;
// the first item in the queue is the first to respawn // the first item in the queue is the first to respawn
if (leveltime - itemrespawntime[iquetail] < (tic_t)time) if (leveltime - itemrespawntime[iquetail] < (tic_t)time)
return; return;
mthing = itemrespawnque[iquetail];
#ifdef PARANOIA
if (!mthing)
I_Error("itemrespawnque[iquetail] is NULL!");
#endif
if (mthing) if (mthing)
P_SpawnMapThing(mthing); P_SpawnMapThing(mthing);