thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

g_demo.c: track player mobj health instead of bumpers

Browse source 
Lord have mercy on my soul!!!
This commit is contained in:
James R 2023-03-07 03:05:12 -08:00
parent 86990d47d2
commit f86f794d20
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/g_demo.c
View file

@ -95,7 +95,8 @@ static struct {
// EZT_ITEMDATA // EZT_ITEMDATA
SINT8 itemtype; SINT8 itemtype;
UINT8 itemamount, bumpers; UINT8 itemamount;
INT32 health;
// EZT_STATDATA // EZT_STATDATA
UINT8 skinid, kartspeed, kartweight; UINT8 skinid, kartspeed, kartweight;
@ -813,13 +814,13 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
if (ghost->player && ( if (ghost->player && (
ghostext[playernum].itemtype != ghost->player->itemtype || ghostext[playernum].itemtype != ghost->player->itemtype ||
ghostext[playernum].itemamount != ghost->player->itemamount || ghostext[playernum].itemamount != ghost->player->itemamount ||
ghostext[playernum].bumpers != ghost->player->bumpers ghostext[playernum].health < ghost->health
)) ))
{ {
ghostext[playernum].flags |= EZT_ITEMDATA; ghostext[playernum].flags |= EZT_ITEMDATA;
ghostext[playernum].itemtype = ghost->player->itemtype; ghostext[playernum].itemtype = ghost->player->itemtype;
ghostext[playernum].itemamount = ghost->player->itemamount; ghostext[playernum].itemamount = ghost->player->itemamount;
ghostext[playernum].bumpers = ghost->player->bumpers; ghostext[playernum].health = ghost->health;
} }
if (ghost->player && ( if (ghost->player && (
@ -881,7 +882,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum)
{ {
WRITESINT8(demobuf.p, ghostext[playernum].itemtype); WRITESINT8(demobuf.p, ghostext[playernum].itemtype);
WRITEUINT8(demobuf.p, ghostext[playernum].itemamount); WRITEUINT8(demobuf.p, ghostext[playernum].itemamount);
WRITEUINT8(demobuf.p, ghostext[playernum].bumpers); WRITEINT32(demobuf.p, ghostext[playernum].health);
} }
if (ghostext[playernum].flags & EZT_STATDATA) if (ghostext[playernum].flags & EZT_STATDATA)
{ {
@ -1064,7 +1065,7 @@ void G_ConsGhostTic(INT32 playernum)
{ {
ghostext[playernum].itemtype = READSINT8(demobuf.p); ghostext[playernum].itemtype = READSINT8(demobuf.p);
ghostext[playernum].itemamount = READUINT8(demobuf.p); ghostext[playernum].itemamount = READUINT8(demobuf.p);
ghostext[playernum].bumpers = READUINT8(demobuf.p); ghostext[playernum].health = READINT32(demobuf.p);
} }
if (xziptic & EZT_STATDATA) if (xziptic & EZT_STATDATA)
{ {
@ -1134,7 +1135,7 @@ void G_ConsGhostTic(INT32 playernum)
if (players[playernum].itemtype != ghostext[playernum].itemtype if (players[playernum].itemtype != ghostext[playernum].itemtype
|| players[playernum].itemamount != ghostext[playernum].itemamount || players[playernum].itemamount != ghostext[playernum].itemamount
|| players[playernum].bumpers != ghostext[playernum].bumpers) || testmo->health < ghostext[playernum].health)
{ {
if (demosynced) if (demosynced)
CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced (item/bumpers)!\n")); CONS_Alert(CONS_WARNING, M_GetText("Demo playback has desynced (item/bumpers)!\n"));
@ -1142,7 +1143,7 @@ void G_ConsGhostTic(INT32 playernum)
players[playernum].itemtype = ghostext[playernum].itemtype; players[playernum].itemtype = ghostext[playernum].itemtype;
players[playernum].itemamount = ghostext[playernum].itemamount; players[playernum].itemamount = ghostext[playernum].itemamount;
players[playernum].bumpers = ghostext[playernum].bumpers; testmo->health = ghostext[playernum].health;
} }
if (players[playernum].kartspeed != ghostext[playernum].kartspeed if (players[playernum].kartspeed != ghostext[playernum].kartspeed