lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

player->oldscale var for pre-Nightserize scale

This commit is contained in:
mazmazz 2018-08-11 00:49:28 -04:00
parent 8154578fb6
commit 480c4f890d
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/d_player.h
View File

@ -457,6 +457,7 @@ typedef struct player_s
mobj_t *capsule; // Go inside the capsule
mobj_t *drone; // Move center to the drone
UINT8 mare; // Current mare
fixed_t oldscale; // Pre-Nightserize scale
// Statistical purposes.
tic_t marebegunat; // Leveltime when mare begun

4
src/lua_playerlib.c
View File

@ -292,6 +292,8 @@ static int player_get(lua_State *L)
LUA_PushUserdata(L, plr->drone, META_MOBJ);
else if (fastcmp(field,"mare"))
lua_pushinteger(L, plr->mare);
else if (fastcmp(field,"oldscale"))
lua_pushfixed(L, plr->oldscale);
else if (fastcmp(field,"marebegunat"))
lua_pushinteger(L, plr->marebegunat);
else if (fastcmp(field,"startedtime"))
@ -579,6 +581,8 @@ static int player_set(lua_State *L)
}
else if (fastcmp(field,"mare"))
plr->mare = (UINT8)luaL_checkinteger(L, 3);
else if (fastcmp(field,"oldscale"))
plr->oldscale = luaL_checkfixed(L, 3);
else if (fastcmp(field,"marebegunat"))
plr->marebegunat = (tic_t)luaL_checkinteger(L, 3);
else if (fastcmp(field,"startedtime"))

2
src/p_saveg.c
View File

@ -199,6 +199,7 @@ static void P_NetArchivePlayers(void)
WRITEUINT8(save_p, players[i].drilldelay);
WRITEUINT8(save_p, players[i].bonustime);
WRITEUINT8(save_p, players[i].mare);
WRITEFIXED(save_p, players[i].oldscale);
WRITEUINT32(save_p, players[i].marebegunat);
WRITEUINT32(save_p, players[i].startedtime);
@ -394,6 +395,7 @@ static void P_NetUnArchivePlayers(void)
players[i].drilldelay = READUINT8(save_p);
players[i].bonustime = (boolean)READUINT8(save_p);
players[i].mare = READUINT8(save_p);
players[i].oldscale = READFIXED(save_p);
players[i].marebegunat = READUINT32(save_p);
players[i].startedtime = READUINT32(save_p);

4
src/p_setup.c
View File

@ -2385,8 +2385,8 @@ static void P_LevelInitStuff(void)
players[i].texttimer = players[i].linkcount =\
players[i].linktimer = players[i].flyangle =\
players[i].anotherflyangle = players[i].nightstime =\
players[i].mare = players[i].realtime =\
players[i].exiting = 0;
players[i].mare = players[i].oldscale =\
players[i].realtime = players[i].exiting = 0;
// i guess this could be part of the above but i feel mildly uncomfortable implicitly casting
players[i].gotcontinue = false;