From 480c4f890db237d419d23dd24ff57e9d240ff676 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Sat, 11 Aug 2018 00:49:28 -0400
Subject: [PATCH] player->oldscale var for pre-Nightserize scale

---
 src/d_player.h      | 1 +
 src/lua_playerlib.c | 4 ++++
 src/p_saveg.c       | 2 ++
 src/p_setup.c       | 4 ++--
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index 91cafa515..9a7ddc089 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -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
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 4fdf25fad..4a5c690b0 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -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"))
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 699b57a5c..923f0b2ed 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -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);
diff --git a/src/p_setup.c b/src/p_setup.c
index 7e8d0fdb1..b154789ab 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -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;