Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2017-12-16 16:07:31 -05:00
commit bd86f98822

View file

@ -715,8 +715,15 @@ static void ArchiveExtVars(void *pointer, const char *ptype)
for (i = 0; lua_next(gL, -2); i++) for (i = 0; lua_next(gL, -2); i++)
lua_pop(gL, 1); lua_pop(gL, 1);
if (i == 0 && !fastcmp(ptype,"player")) // skip anything that has an empty table and isn't a player. // skip anything that has an empty table and isn't a player.
if (i == 0)
{
if (fastcmp(ptype,"player")) // always include players even if they have no extra variables
WRITEUINT16(save_p, 0);
lua_pop(gL, 1);
return; return;
}
if (fastcmp(ptype,"mobj")) // mobjs must write their mobjnum as a header if (fastcmp(ptype,"mobj")) // mobjs must write their mobjnum as a header
WRITEUINT32(save_p, ((mobj_t *)pointer)->mobjnum); WRITEUINT32(save_p, ((mobj_t *)pointer)->mobjnum);
WRITEUINT16(save_p, i); WRITEUINT16(save_p, i);