vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems

This commit is contained in:
TehRealSalt 2018-07-03 16:18:39 -04:00
parent d0fe935583 37a336a4cf
commit cbfa6bbe83
1 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/d_clisrv.c
View File

@ -4345,7 +4345,7 @@ static INT16 Consistancy(void)
{ {
if (!playeringame[i]) if (!playeringame[i])
ret ^= 0xCCCC; ret ^= 0xCCCC;
else if (!players[i].mo); else if (!players[i].mo || gamestate != GS_LEVEL);
else else
{ {
ret += players[i].mo->x; ret += players[i].mo->x;
@ -4356,7 +4356,7 @@ static INT16 Consistancy(void)
} }
// I give up // I give up
// Coop desynching enemies is painful // Coop desynching enemies is painful
if (!G_RaceGametype()) if (gamestate == GS_LEVEL)
ret += P_GetRandSeed(); ret += P_GetRandSeed();
#ifdef MOBJCONSISTANCY #ifdef MOBJCONSISTANCY
@ -4365,6 +4365,8 @@ static INT16 Consistancy(void)
DEBFILE(va("Consistancy = %u\n", ret)); DEBFILE(va("Consistancy = %u\n", ret));
return ret; return ret;
} }
if (gamestate == GS_LEVEL)
{
for (th = thinkercap.next; th != &thinkercap; th = th->next) for (th = thinkercap.next; th != &thinkercap; th = th->next)
{ {
if (th->function.acp1 != (actionf_p1)P_MobjThinker) if (th->function.acp1 != (actionf_p1)P_MobjThinker)
@ -4431,6 +4433,7 @@ static INT16 Consistancy(void)
ret += mo->frame; ret += mo->frame;
} }
} }
}
#endif #endif
DEBFILE(va("Consistancy = %u\n", (ret & 0xFFFF))); DEBFILE(va("Consistancy = %u\n", (ret & 0xFFFF)));