thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 12:31:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge lua_script.c

Browse source
This commit is contained in:
SteelT 2020-08-04 00:45:49 -04:00
parent 5788c98f3c
commit a7f2ab7dea
1 changed files with 9 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/lua_script.c
View file

@ -1889,39 +1889,25 @@ void LUA_Archive(void)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
<<<<<<< HEAD
if (!playeringame[i] && i > 0) // NEVER skip player 0, this is for dedi servs. if (!playeringame[i] && i > 0) // NEVER skip player 0, this is for dedi servs.
=======
if (!playeringame[i] && i > 0) // dedicated servers...
>>>>>>> srb2/next
continue; continue;
// all players in game will be archived, even if they just add a 0. // all players in game will be archived, even if they just add a 0.
ArchiveExtVars(&players[i], "player"); ArchiveExtVars(&players[i], "player");
} }
<<<<<<< HEAD
if (gamestate == GS_LEVEL) if (gamestate == GS_LEVEL)
{ {
for (th = thinkercap.next; th != &thinkercap; th = th->next) for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
if (th->function.acp1 == (actionf_p1)P_MobjThinker) {
{ if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
// archive function will determine when to skip mobjs, continue;
// and write mobjnum in otherwise.
ArchiveExtVars(th, "mobj");
}
}
=======
for (th = thlist[THINK_MOBJ].next; th != &thlist[THINK_MOBJ]; th = th->next)
{
if (th->function.acp1 == (actionf_p1)P_RemoveThinkerDelayed)
continue;
// archive function will determine when to skip mobjs, // archive function will determine when to skip mobjs,
// and write mobjnum in otherwise. // and write mobjnum in otherwise.
ArchiveExtVars(th, "mobj"); ArchiveExtVars(th, "mobj");
}
} }
>>>>>>> srb2/next
WRITEUINT32(save_p, UINT32_MAX); // end of mobjs marker, replaces mobjnum. WRITEUINT32(save_p, UINT32_MAX); // end of mobjs marker, replaces mobjnum.
LUAh_NetArchiveHook(NetArchive); // call the NetArchive hook in archive mode LUAh_NetArchiveHook(NetArchive); // call the NetArchive hook in archive mode
@ -1942,11 +1928,7 @@ void LUA_UnArchive(void)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
<<<<<<< HEAD
if (!playeringame[i] && i > 0) // same here, this is to synch dediservs properly. if (!playeringame[i] && i > 0) // same here, this is to synch dediservs properly.
=======
if (!playeringame[i] && i > 0) // dedicated servers...
>>>>>>> srb2/next
continue; continue;
UnArchiveExtVars(&players[i]); UnArchiveExtVars(&players[i]);
} }