thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 20:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sonicitems

Browse source
This commit is contained in:
Sryder 2018-07-06 23:33:54 +01:00
commit a7ea4db50d
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -3539,7 +3539,7 @@ static void HandleConnect(SINT8 node)
#ifdef JOININGAME #ifdef JOININGAME
if (nodewaiting[node]) if (nodewaiting[node])
{ {
if (newnode) if (node && newnode)
{ {
SV_SendSaveGame(node); // send a complete game state SV_SendSaveGame(node); // send a complete game state
DEBFILE("send savegame\n"); DEBFILE("send savegame\n");

3
src/p_saveg.c
View file

@ -3397,6 +3397,8 @@ void P_SaveNetGame(void)
P_NetArchiveMisc(); P_NetArchiveMisc();
// Assign the mobjnumber for pointer tracking // Assign the mobjnumber for pointer tracking
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)
@ -3407,6 +3409,7 @@ void P_SaveNetGame(void)
mobj->mobjnum = i++; mobj->mobjnum = i++;
} }
} }
}
P_NetArchivePlayers(); P_NetArchivePlayers();
if (gamestate == GS_LEVEL) if (gamestate == GS_LEVEL)