From cc04d41903d776c367e1b50689a58536ca0c0458 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 30 Aug 2020 07:53:20 +0200
Subject: [PATCH] - Duke: moved the clock reset to a separate function and
 deleted the unused lockclock variable.

---
 source/games/duke/src/funct.h      |  1 +
 source/games/duke/src/gameloop.cpp | 14 ++++++++------
 source/games/duke/src/global.cpp   |  2 --
 source/games/duke/src/global.h     |  2 --
 source/games/duke/src/premap.cpp   |  6 +-----
 source/games/duke/src/savegame.cpp |  3 ---
 6 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/source/games/duke/src/funct.h b/source/games/duke/src/funct.h
index 3027c5bf4..a6df8ffae 100644
--- a/source/games/duke/src/funct.h
+++ b/source/games/duke/src/funct.h
@@ -243,6 +243,7 @@ void setinterpolation(int* posptr);
 void stopinterpolation(int* posptr);
 void dointerpolations(int smoothratio);
 int* animateptr(int i);
+void resetGameClock();
 
 void backuppos(player_struct* p, bool noclipping = false);
 void backuplook(player_struct* p);
diff --git a/source/games/duke/src/gameloop.cpp b/source/games/duke/src/gameloop.cpp
index fc57bd5de..0178cefc2 100644
--- a/source/games/duke/src/gameloop.cpp
+++ b/source/games/duke/src/gameloop.cpp
@@ -182,7 +182,6 @@ int domovethings()
 	// mplpadsave();
 
 	ud.camerasprite = -1;
-	lockclock += TICSPERFRAME;
 
 	if (earthquaketime > 0) earthquaketime--;
 	if (rtsplaying > 0) rtsplaying--;
@@ -360,14 +359,17 @@ void startmainmenu()
 	FX_StopAllSounds();
 }
 
+void resetGameClock()
+{
+	I_ResetTime();
+	lastTic = -1;
+	gameclock = 0;
+	cloudclock = 0;
+}
 
 static void Startup()
 {
-		I_ResetTime();
-		lastTic = -1;
-		gameclock = 0;
-		lockclock = 0;
-
+	resetGameClock();
 		ps[myconnectindex].ftq = 0;
 
 		if (userConfig.CommandMap.IsNotEmpty())
diff --git a/source/games/duke/src/global.cpp b/source/games/duke/src/global.cpp
index ed76dc31f..262b940a0 100644
--- a/source/games/duke/src/global.cpp
+++ b/source/games/duke/src/global.cpp
@@ -114,8 +114,6 @@ int16_t cyclers[MAXCYCLERS][6];
 int16_t mirrorsector[64];
 int16_t mirrorwall[64];
 
-int lockclock;
-
 // Redneck Rampage
 int wupass;
 int chickenplant;
diff --git a/source/games/duke/src/global.h b/source/games/duke/src/global.h
index 9e13c619c..41768b54e 100644
--- a/source/games/duke/src/global.h
+++ b/source/games/duke/src/global.h
@@ -106,8 +106,6 @@ extern int16_t cyclers[MAXCYCLERS][6];
 extern int16_t mirrorsector[64];
 extern int16_t mirrorwall[64];
 
-extern int lockclock;
-
 extern int wupass;
 extern int chickenplant;
 extern int thunderon;
diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp
index d6b27c58e..b49b56023 100644
--- a/source/games/duke/src/premap.cpp
+++ b/source/games/duke/src/premap.cpp
@@ -756,12 +756,8 @@ void prelevel_common(int g)
 
 void resettimevars(void)
 {
-    I_ResetTime();
-    lastTic = -1;
-    gameclock = 0;
-    cloudclock = 0;
+    resetGameClock();
     levelTextTime = 85;
-    lockclock = 0;
     ready2send = 1;
     if (camsprite >= 0)
         hittype[camsprite].temp_data[0] = 0;
diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp
index 3a89f2358..01137ccf8 100644
--- a/source/games/duke/src/savegame.cpp
+++ b/source/games/duke/src/savegame.cpp
@@ -443,7 +443,6 @@ void GameInterface::SerializeGameState(FSerializer& arc)
 			("mirrorcnt", mirrorcnt)
 			.Array("mirrorsector", mirrorsector, mirrorcnt)
 			.Array("mirrorwall", mirrorwall, mirrorcnt)
-			("lockclock", lockclock)
 			("wupass", wupass)
 			("chickenplant", chickenplant)
 			("thunderon", thunderon)
@@ -482,8 +481,6 @@ void GameInterface::SerializeGameState(FSerializer& arc)
 			// Todo: move to backend
 			("gameclock", gameclock)
 
-			("lockclock", lockclock)
-
 			.Array("po", po, ud.multimode)
 			.EndObject();