From 76b05dbcd668a8b88e45ce619c5d0347c532e159 Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Wed, 26 Aug 2020 07:59:28 +1000 Subject: [PATCH] - Build (and games): Remove `totalclocklock`. --- source/build/include/build.h | 4 +--- source/build/src/engine.cpp | 1 - source/exhumed/src/enginesubs.cpp | 1 - source/games/duke/src/savegame.cpp | 1 - source/sw/src/game.cpp | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/source/build/include/build.h b/source/build/include/build.h index fa8f6815a..d8a20dee5 100644 --- a/source/build/include/build.h +++ b/source/build/include/build.h @@ -364,9 +364,7 @@ EXTERN struct validmode_t validmode[MAXVALIDMODES]; EXTERN int32_t Numsprites; EXTERN int16_t numsectors, numwalls; EXTERN int32_t display_mirror; -// totalclocklock: the totalclock value that is backed up once on each -// drawrooms() and is used for animateoffs(). -EXTERN ClockTicks totalclock, totalclocklock; +EXTERN ClockTicks totalclock; static inline int32_t BGetTime(void) { return (int32_t) totalclock; } EXTERN int32_t randomseed; diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index 75dd93d97..380a9683f 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -1286,7 +1286,6 @@ int32_t renderDrawRoomsQ16(int32_t daposx, int32_t daposy, int32_t daposz, globalhoriz = fix16_to_int(qglobalhoriz); globalcursectnum = dacursectnum; - totalclocklock = I_GetBuildTime(); if ((xyaspect != oxyaspect) || (xdimen != oxdimen) || (viewingrange != oviewingrange)) dosetaspect(); diff --git a/source/exhumed/src/enginesubs.cpp b/source/exhumed/src/enginesubs.cpp index 023cb2621..3f637d43a 100644 --- a/source/exhumed/src/enginesubs.cpp +++ b/source/exhumed/src/enginesubs.cpp @@ -30,7 +30,6 @@ BEGIN_PS_NS void resettiming() { totalclock = 0; -// TODO totalclocklock = 0L; } void doTileLoad(int i) diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp index 7eb5f0393..a3a4fadc4 100644 --- a/source/games/duke/src/savegame.cpp +++ b/source/games/duke/src/savegame.cpp @@ -481,7 +481,6 @@ void GameInterface::SerializeGameState(FSerializer& arc) // Todo: move to backend ("gameclock", gameclock) - ("totalclocklock", totalclocklock) ("lockclock", lockclock) diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 800a181df..ea71f9b3f 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -316,7 +316,6 @@ void DrawMenuLevelScreen(void) { const int TITLE_PIC = 2324; twod->ClearScreen(); - totalclocklock = gameclock; DrawTexture(twod, tileGetTexture(TITLE_PIC), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_LegacyRenderStyle, STYLE_Normal, DTA_Color, shadeToLight(20), TAG_DONE);