From 45e57fa7918a11af79107cb73c4b08040fdd63ae Mon Sep 17 00:00:00 2001
From: Riku Salminen <38985578+Riku-S@users.noreply.github.com>
Date: Wed, 9 Jun 2021 19:40:59 +0300
Subject: [PATCH] Revert "Revert "Made height/spinheight and height change
values in replays more accurate""
This reverts commit fbeabad7972c966776a3d86617caefc799a1e440.
---
src/g_demo.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/g_demo.c b/src/g_demo.c
index 80968cd1c..7793e0272 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -463,8 +463,7 @@ void G_WriteGhostTic(mobj_t *ghost)
WRITEUINT16(demo_p,oldghost.sprite);
if (ghostext.flags & EZT_HEIGHT)
{
- height >>= FRACBITS;
- WRITEINT16(demo_p, height);
+ WRITEFIXED(demo_p, height);
}
ghostext.flags = 0;
}
@@ -620,7 +619,7 @@ void G_ConsGhostTic(void)
if (xziptic & EZT_SPRITE)
demo_p += sizeof(UINT16);
if (xziptic & EZT_HEIGHT)
- demo_p += sizeof(INT16);
+ demo_p += (demoversion < 0x000e) ? sizeof(INT16) : sizeof(fixed_t);
}
if (ziptic & GZT_FOLLOW)
@@ -854,7 +853,7 @@ void G_GhostTicker(void)
g->mo->sprite = READUINT16(g->p);
if (xziptic & EZT_HEIGHT)
{
- fixed_t temp = READINT16(g->p)<<FRACBITS;
+ fixed_t temp = (g->version < 0x000e) ? READINT16(g->p)<<FRACBITS : READFIXED(g->p);
g->mo->height = FixedMul(temp, g->mo->scale);
}
}
@@ -1118,7 +1117,7 @@ void G_ReadMetalTic(mobj_t *metal)
metal->sprite = READUINT16(metal_p);
if (xziptic & EZT_HEIGHT)
{
- fixed_t temp = READINT16(metal_p)<<FRACBITS;
+ fixed_t temp = (metalversion < 0x000e) ? READINT16(metal_p)<<FRACBITS : READFIXED(metal_p);
metal->height = FixedMul(temp, metal->scale);
}
}
@@ -1305,8 +1304,7 @@ void G_WriteMetalTic(mobj_t *metal)
WRITEUINT16(demo_p,oldmetal.sprite);
if (ghostext.flags & EZT_HEIGHT)
{
- height >>= FRACBITS;
- WRITEINT16(demo_p, height);
+ WRITEFIXED(demo_p, height);
}
ghostext.flags = 0;
}
@@ -1486,8 +1484,8 @@ void G_BeginRecording(void)
WRITEUINT8(demo_p,player->thrustfactor);
WRITEUINT8(demo_p,player->accelstart);
WRITEUINT8(demo_p,player->acceleration);
- WRITEUINT8(demo_p,player->height>>FRACBITS);
- WRITEUINT8(demo_p,player->spinheight>>FRACBITS);
+ WRITEFIXED(demo_p,player->height);
+ WRITEFIXED(demo_p,player->spinheight);
WRITEUINT8(demo_p,player->camerascale>>FRACBITS);
WRITEUINT8(demo_p,player->shieldscale>>FRACBITS);
@@ -1913,8 +1911,8 @@ void G_DoPlayDemo(char *defdemoname)
thrustfactor = READUINT8(demo_p);
accelstart = READUINT8(demo_p);
acceleration = READUINT8(demo_p);
- height = (fixed_t)READUINT8(demo_p)<<FRACBITS;
- spinheight = (fixed_t)READUINT8(demo_p)<<FRACBITS;
+ height = (demoversion < 0x000e) ? (fixed_t)READUINT8(demo_p)<<FRACBITS : READFIXED(demo_p);
+ spinheight = (demoversion < 0x000e) ? (fixed_t)READUINT8(demo_p)<<FRACBITS : READFIXED(demo_p);
camerascale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
shieldscale = (fixed_t)READUINT8(demo_p)<<FRACBITS;
jumpfactor = READFIXED(demo_p);
@@ -2160,8 +2158,7 @@ void G_AddGhost(char *defdemoname)
p++; // thrustfactor
p++; // accelstart
p++; // acceleration
- p++; // height
- p++; // spinheight
+ p += (ghostversion < 0x000e) ? 2 : 2 * sizeof(fixed_t); // height and spinheight
p++; // camerascale
p++; // shieldscale
p += 4; // jumpfactor
--
GitLab