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

Merge branch 'master' into sonicitems

This commit is contained in:
Sryder 2018-07-06 23:33:54 +01:00
parent 39e6169b42 6c8a92b44f
commit 5d342f32c8
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
if (nodewaiting[node])
{
if (newnode)
if (node && newnode)
{
SV_SendSaveGame(node); // send a complete game state
DEBFILE("send savegame\n");

15
src/p_saveg.c
View File

@ -3397,14 +3397,17 @@ void P_SaveNetGame(void)
P_NetArchiveMisc();
// Assign the mobjnumber for pointer tracking
for (th = thinkercap.next; th != &thinkercap; th = th->next)
if (gamestate == GS_LEVEL)
{
if (th->function.acp1 == (actionf_p1)P_MobjThinker)
for (th = thinkercap.next; th != &thinkercap; th = th->next)
{
mobj = (mobj_t *)th;
if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER)
continue;
mobj->mobjnum = i++;
if (th->function.acp1 == (actionf_p1)P_MobjThinker)
{
mobj = (mobj_t *)th;
if (mobj->type == MT_HOOP || mobj->type == MT_HOOPCOLLIDE || mobj->type == MT_HOOPCENTER)
continue;
mobj->mobjnum = i++;
}
}
}