Fix G_GhostTicker crashing trying to read netvars as ghost data

Also fixed possible issue with incorrectly reading the demo pointer due to the wrong type being passed to sizeof in G_ConsGhostTic
This commit is contained in:
Steel Titanium 2020-10-19 20:20:08 -04:00
parent b84c45acaa
commit 3f50b92ee2

View file

@ -625,7 +625,7 @@ void G_ConsGhostTic(void)
if (followtic & FZT_SCALE) if (followtic & FZT_SCALE)
demo_p += sizeof(fixed_t); demo_p += sizeof(fixed_t);
// momx, momy and momz // momx, momy and momz
demo_p += (demoversion < 0x000e) ? sizeof(UINT16) * 3 : sizeof(fixed_t) * 3; demo_p += (demoversion < 0x000e) ? sizeof(INT16) * 3 : sizeof(fixed_t) * 3;
if (followtic & FZT_SKIN) if (followtic & FZT_SKIN)
demo_p++; demo_p++;
demo_p += sizeof(UINT16); demo_p += sizeof(UINT16);
@ -2163,7 +2163,7 @@ void G_AddGhost(char *defdemoname)
count = READUINT16(p); count = READUINT16(p);
while (count--) while (count--)
{ {
p += 2; SKIPSTRING(p);
SKIPSTRING(p); SKIPSTRING(p);
p++; p++;
} }