New player variables: Fix typing edge cases

- p_saveg.c
- lua_playerlib.c
This commit is contained in:
toaster 2023-09-26 22:52:38 +01:00
parent a68a0b0135
commit 5c57214e8c
2 changed files with 18 additions and 18 deletions

View file

@ -938,11 +938,11 @@ static int player_set(lua_State *L)
else if (fastcmp(field,"rideroidrollangle"))
plr->rideroidrollangle = luaL_checkinteger(L, 3);
else if (fastcmp(field,"rdaddmomx"))
plr->rdaddmomx = luaL_checkinteger(L, 3);
plr->rdaddmomx = luaL_checkfixed(L, 3);
else if (fastcmp(field,"rdaddmomy"))
plr->rdaddmomy = luaL_checkinteger(L, 3);
plr->rdaddmomy = luaL_checkfixed(L, 3);
else if (fastcmp(field,"rdaddmomz"))
plr->rdaddmomz = luaL_checkinteger(L, 3);
plr->rdaddmomz = luaL_checkfixed(L, 3);
// bungee
else if (fastcmp(field,"bungee"))
@ -960,7 +960,7 @@ static int player_set(lua_State *L)
else if (fastcmp(field,"dlzrocketanglev"))
plr->dlzrocketanglev = luaL_checkinteger(L, 3);
else if (fastcmp(field,"dlzrocketspd"))
plr->dlzrocketspd = luaL_checkinteger(L, 3);
plr->dlzrocketspd = luaL_checkfixed(L, 3);
// seasaws
else if (fastcmp(field,"seasaw"))
@ -968,7 +968,7 @@ static int player_set(lua_State *L)
else if (fastcmp(field,"seasawcooldown"))
plr->seasawcooldown = luaL_checkinteger(L, 3);
else if (fastcmp(field,"seasawdist"))
plr->seasawdist = luaL_checkinteger(L, 3);
plr->seasawdist = luaL_checkfixed(L, 3);
else if (fastcmp(field,"seasawangle"))
plr->seasawangle = luaL_checkinteger(L, 3);
else if (fastcmp(field,"seasawangleadd"))
@ -984,7 +984,7 @@ static int player_set(lua_State *L)
else if (fastcmp(field,"turbineangle"))
plr->turbineangle = luaL_checkinteger(L, 3);
else if (fastcmp(field,"turbineheight"))
plr->turbineheight = luaL_checkinteger(L, 3);
plr->turbineheight = luaL_checkfixed(L, 3);
else if (fastcmp(field,"turbinespd"))
plr->turbinespd = luaL_checkinteger(L, 3);

View file

@ -571,11 +571,11 @@ static void P_NetArchivePlayers(savebuffer_t *save)
WRITEUINT32(save->p, players[i].dlzrocket);
WRITEANGLE(save->p, players[i].dlzrocketangle);
WRITEINT32(save->p, players[i].dlzrocketanglev);
WRITEUINT32(save->p, players[i].dlzrocketspd);
WRITEFIXED(save->p, players[i].dlzrocketspd);
WRITEUINT8(save->p, players[i].seasaw);
WRITEUINT32(save->p, players[i].seasawcooldown);
WRITEUINT32(save->p, players[i].seasawdist);
WRITEFIXED(save->p, players[i].seasawdist);
WRITEINT32(save->p, players[i].seasawangle);
WRITEINT32(save->p, players[i].seasawangleadd);
WRITEINT32(save->p, players[i].seasawmoreangle);
@ -1065,8 +1065,8 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].ringboxaward = READUINT8(save->p);
players[i].outrun = READFIXED(save->p);
players[i].rideroid = READUINT8(save->p);
players[i].rdnodepull = READUINT8(save->p);
players[i].rideroid = (boolean)READUINT8(save->p);
players[i].rdnodepull = (boolean)READUINT8(save->p);
players[i].rideroidangle = READINT32(save->p);
players[i].rideroidspeed = READFIXED(save->p);
players[i].rideroidrollangle = READINT32(save->p);
@ -1076,25 +1076,25 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].bungee = READUINT8(save->p);
players[i].lasthover = READUINT32(save->p);
players[i].lasthover = (tic_t)READUINT32(save->p);
players[i].dlzrocket = READUINT32(save->p);
players[i].dlzrocket = (tic_t)READUINT32(save->p);
players[i].dlzrocketangle = READANGLE(save->p);
players[i].dlzrocketanglev = READINT32(save->p);
players[i].dlzrocketspd = READUINT32(save->p);
players[i].dlzrocketspd = READFIXED(save->p);
players[i].seasaw = READUINT8(save->p);
players[i].seasaw = (boolean)READUINT8(save->p);
players[i].seasawcooldown = READUINT32(save->p);
players[i].seasawdist = READUINT32(save->p);
players[i].seasawdist = READFIXED(save->p);
players[i].seasawangle = READINT32(save->p);
players[i].seasawangleadd = READINT32(save->p);
players[i].seasawmoreangle = READINT32(save->p);
players[i].seasawdir = READUINT8(save->p);
players[i].seasawdir = (boolean)READUINT8(save->p);
players[i].turbine = READUINT32(save->p);
players[i].turbine = (tic_t)READUINT32(save->p);
players[i].turbineangle = READINT32(save->p);
players[i].turbineheight = READFIXED(save->p);
players[i].turbinespd = READUINT8(save->p);
players[i].turbinespd = (boolean)READUINT8(save->p);
// respawnvars_t
players[i].respawn.state = READUINT8(save->p);