Merge branch 'fix-antique-ghost-netvars' into 'next'

Fix antique ghost netvars

See merge request STJr/SRB2!1545
This commit is contained in:
Tatsuru 2021-09-12 20:33:01 +00:00
commit 94799e2196

View file

@ -2023,7 +2023,7 @@ void G_AddGhost(char *defdemoname)
char name[17],skin[17],color[MAXCOLORNAME+1],*n,*pdemoname,md5[16];
UINT8 cnamelen;
demoghost *gh;
UINT8 flags;
UINT8 flags, subversion;
UINT8 *buffer,*p;
mapthing_t *mthing;
UINT16 count, ghostversion;
@ -2071,7 +2071,7 @@ void G_AddGhost(char *defdemoname)
return;
} p += 12; // DEMOHEADER
p++; // VERSION
p++; // SUBVERSION
subversion = READUINT8(p); // SUBVERSION
ghostversion = READUINT16(p);
switch(ghostversion)
{
@ -2169,11 +2169,21 @@ void G_AddGhost(char *defdemoname)
// net var data
count = READUINT16(p);
while (count--)
{
// In 2.2.7 netvar saving was updated
if (subversion < 7)
{
p += 2;
SKIPSTRING(p);
p++;
}
else
{
SKIPSTRING(p);
SKIPSTRING(p);
p++;
}
}
if (*p == DEMOMARKER)
{