From e0aaaf1f60fc45baf11f6bb3a04fdfb6ccaa2ae5 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Wed, 26 Aug 2020 09:41:23 +1000
Subject: [PATCH] - All Games: Move `gameclock` and `lastTic` to gamecontrol.

---
 source/blood/src/globals.cpp      | 2 --
 source/blood/src/globals.h        | 2 --
 source/core/gamecontrol.cpp       | 2 ++
 source/core/gamecontrol.h         | 2 ++
 source/exhumed/src/engine.h       | 3 +--
 source/exhumed/src/enginesubs.cpp | 1 +
 source/exhumed/src/init.cpp       | 2 --
 source/games/duke/src/global.cpp  | 3 +--
 source/games/duke/src/global.h    | 2 --
 source/sw/src/game.h              | 3 +--
 source/sw/src/network.cpp         | 3 +--
 11 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/source/blood/src/globals.cpp b/source/blood/src/globals.cpp
index 566580a03..d22c611ab 100644
--- a/source/blood/src/globals.cpp
+++ b/source/blood/src/globals.cpp
@@ -35,8 +35,6 @@ BEGIN_BLD_NS
 bool bVanilla = false;
 int gFrameClock;
 int gFrameTicks;
-int gameclock;
-int lastTic;
 int gFrame;
 //int volatile gGameClock;
 int gFrameRate;
diff --git a/source/blood/src/globals.h b/source/blood/src/globals.h
index b31638f90..8da9549db 100644
--- a/source/blood/src/globals.h
+++ b/source/blood/src/globals.h
@@ -32,8 +32,6 @@ BEGIN_BLD_NS
 
 extern int gFrameClock;
 extern int gFrameTicks;
-extern int gameclock;
-extern int lastTic;
 extern int gFrame;
 //extern int gGameClock;
 extern int gFrameRate;
diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
index d5193b182..45019411e 100644
--- a/source/core/gamecontrol.cpp
+++ b/source/core/gamecontrol.cpp
@@ -100,6 +100,8 @@ auto vsnprintfptr = vsnprintf;	// This is an inline in Visual Studio but we need
 static int lastototalclk;
 static uint64_t elapsedTime;
 static uint64_t lastTime;
+int gameclock;
+int lastTic;
 
 bool sendPause;
 int automapMode;
diff --git a/source/core/gamecontrol.h b/source/core/gamecontrol.h
index 45c888c49..6a81622af 100644
--- a/source/core/gamecontrol.h
+++ b/source/core/gamecontrol.h
@@ -221,3 +221,5 @@ enum AM_Mode
 extern int automapMode;
 extern bool automapFollow;
 extern bool sendPause;
+extern int gameclock;
+extern int lastTic;
diff --git a/source/exhumed/src/engine.h b/source/exhumed/src/engine.h
index b692edfe5..d2b2858c9 100644
--- a/source/exhumed/src/engine.h
+++ b/source/exhumed/src/engine.h
@@ -60,8 +60,7 @@ enum {
     kSectLava = 0x4000,
 };
 
-extern int ogameclock, gameclock;
-extern int lastTic;
+extern int ogameclock;
 extern int initx;
 extern int inity;
 extern int initz;
diff --git a/source/exhumed/src/enginesubs.cpp b/source/exhumed/src/enginesubs.cpp
index 9da49b062..80398e2d1 100644
--- a/source/exhumed/src/enginesubs.cpp
+++ b/source/exhumed/src/enginesubs.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //#include <io.h>
 //#include <fcntl.h>
 #include "gamecvars.h"
+#include "gamecontrol.h"
 
 // static int globhiz, globloz, globhihit, globlohit;
 
diff --git a/source/exhumed/src/init.cpp b/source/exhumed/src/init.cpp
index e6a33f234..3e296f755 100644
--- a/source/exhumed/src/init.cpp
+++ b/source/exhumed/src/init.cpp
@@ -39,8 +39,6 @@ enum
 };
 
 int ogameclock = 0;
-int gameclock = 0;
-int lastTic;
 
 int initx, inity, initz;
 short inita, initsect;
diff --git a/source/games/duke/src/global.cpp b/source/games/duke/src/global.cpp
index 77f6e5585..e9ef53281 100644
--- a/source/games/duke/src/global.cpp
+++ b/source/games/duke/src/global.cpp
@@ -53,8 +53,7 @@ int max_player_health;
 int max_armour_amount;
 int lasermode;
 
-int gameclock = 0, cameradist = 0, cameraclock = 0;
-int lastTic = -1;
+int cameradist = 0, cameraclock = 0;
 int otherp;	
 TileInfo tileinfo[MAXTILES]; // This is not from EDuke32.
 ActorInfo actorinfo[MAXTILES];
diff --git a/source/games/duke/src/global.h b/source/games/duke/src/global.h
index f7fc366e8..c4f31bd17 100644
--- a/source/games/duke/src/global.h
+++ b/source/games/duke/src/global.h
@@ -37,8 +37,6 @@ extern int max_player_health;
 extern int max_armour_amount;
 extern int lasermode;
 
-extern int gameclock;
-extern int lastTic;
 extern int cameraclock;
 extern int cameradist;
 extern int otherp; // transient helper, MP only
diff --git a/source/sw/src/game.h b/source/sw/src/game.h
index 8ade7786e..93b2062e7 100644
--- a/source/sw/src/game.h
+++ b/source/sw/src/game.h
@@ -2188,8 +2188,7 @@ extern USER puser[MAX_SW_PLAYERS_REG];
 ///////////////////////////
 
 extern int gotlastpacketclock;
-extern int ogameclock, gameclock;
-extern int lastTic;
+extern int ogameclock;
 extern SWBOOL ready2send;
 extern double smoothratio;
 
diff --git a/source/sw/src/network.cpp b/source/sw/src/network.cpp
index 369784d2a..33717e79d 100644
--- a/source/sw/src/network.cpp
+++ b/source/sw/src/network.cpp
@@ -95,8 +95,7 @@ uint8_t syncstat[MAXSYNCBYTES];
 int syncvaltail, syncvaltottail;
 void GetSyncInfoFromPacket(uint8_t *packbuf, int packbufleng, int *j, int otherconnectindex);
 
-int ogameclock, gameclock;
-int lastTic;
+int ogameclock;
 double smoothratio;
 
 // must start out as 0