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

Fix Demo lua archive crash for real this time

This commit is contained in:
Latapostrophe 2020-03-12 15:31:58 +01:00
parent b905f20cd4
commit cbc7fe7b67
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lua_script.c
View File

@ -1247,6 +1247,14 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
return 0; return 0;
} }
// Unarchives from demo_p:
// Return values:
// 0: Normal
// 1: Read table key
// 2: Read table value
// 3: Don't use setfield
static UINT8 UnArchiveValueDemo(int TABLESINDEX, char field[1024]) static UINT8 UnArchiveValueDemo(int TABLESINDEX, char field[1024])
{ {
UINT8 type = READUINT8(demo_p); UINT8 type = READUINT8(demo_p);
@ -1305,7 +1313,8 @@ static UINT8 UnArchiveValueDemo(int TABLESINDEX, char field[1024])
else else
CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n"); CONS_Alert(CONS_WARNING,"Couldn't read mobj_t\n");
break; return 3; // Don't set the field
case ARCH_PLAYER: case ARCH_PLAYER:
LUA_PushUserdata(gL, &players[READUINT8(demo_p)], META_PLAYER); LUA_PushUserdata(gL, &players[READUINT8(demo_p)], META_PLAYER);
break; break;
@ -1387,9 +1396,7 @@ static void UnArchiveExtVarsDemo(void *pointer)
for (i = 0; i < field_count; i++) for (i = 0; i < field_count; i++)
{ {
READSTRING(demo_p, field); READSTRING(demo_p, field);
//CONS_Printf("%s\n", field); if (UnArchiveValueDemo(TABLESINDEX, field) != 3) // This will return 3 if we shouldn't set this field.
CONS_Printf("%s\n", field);
UnArchiveValueDemo(TABLESINDEX, field);
lua_setfield(gL, -2, field); lua_setfield(gL, -2, field);
} }