diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp index 88346adfc..845521e54 100644 --- a/source/core/gamecontrol.cpp +++ b/source/core/gamecontrol.cpp @@ -128,7 +128,6 @@ GameInterface* gi; int myconnectindex, numplayers; int connecthead, connectpoint2[MAXPLAYERS]; auto vsnprintfptr = vsnprintf; // This is an inline in Visual Studio but we need an address for it to satisfy the MinGW compiled libraries. -int lastTic; extern bool pauseext; diff --git a/source/core/gamecontrol.h b/source/core/gamecontrol.h index be605e2a8..c2579862b 100644 --- a/source/core/gamecontrol.h +++ b/source/core/gamecontrol.h @@ -237,9 +237,6 @@ enum extern int paused; extern int chatmodeon; - -extern int lastTic; - extern int PlayClock; enum gameaction_t : int diff --git a/source/games/exhumed/src/engine.h b/source/games/exhumed/src/engine.h index bc1d958f2..1dbc89021 100644 --- a/source/games/exhumed/src/engine.h +++ b/source/games/exhumed/src/engine.h @@ -40,7 +40,6 @@ inline Collision movespritevel(DExhumedActor* spritenum, const DVector3& pos, do } void precache(); -void resettiming(); // cd diff --git a/source/games/exhumed/src/enginesubs.cpp b/source/games/exhumed/src/enginesubs.cpp index 51aaca231..ef9357c70 100644 --- a/source/games/exhumed/src/enginesubs.cpp +++ b/source/games/exhumed/src/enginesubs.cpp @@ -15,25 +15,16 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ //------------------------------------------------------------------------- + #include "ns.h" #include "engine.h" #include "precache.h" - -//#include -//#include #include "gamecvars.h" #include "gamecontrol.h" -// static int globhiz, globloz, globhihit, globlohit; BEGIN_PS_NS - -void resettiming() -{ - lastTic = -1; -} - //--------------------------------------------------------------------------- // // @@ -53,4 +44,5 @@ void precache() } precacheMarkedTiles(); } + END_PS_NS diff --git a/source/games/exhumed/src/exhumed.cpp b/source/games/exhumed/src/exhumed.cpp index 73a228663..f967ad942 100644 --- a/source/games/exhumed/src/exhumed.cpp +++ b/source/games/exhumed/src/exhumed.cpp @@ -101,7 +101,6 @@ int EndLevel = 0; void ResetEngine() { EraseScreen(-1); - resettiming(); } void GameInterface::loadPalette() @@ -647,7 +646,6 @@ void GameInterface::app_init() seq_LoadSequences(); InitStatus(); - resettiming(); GrabPalette(); enginecompatibility_mode = ENGINECOMPATIBILITY_19961112; diff --git a/source/games/exhumed/src/gameloop.cpp b/source/games/exhumed/src/gameloop.cpp index 65170c91d..c0531b6e5 100644 --- a/source/games/exhumed/src/gameloop.cpp +++ b/source/games/exhumed/src/gameloop.cpp @@ -233,7 +233,6 @@ void GameInterface::LevelCompleted(MapRecord *to_map, int skill) void GameInterface::Startup() { - resettiming(); EndLevel = 0; PlayLogos(ga_mainmenu, ga_mainmenu, false); }