zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-29 13:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- gameclock abstraction

Browse source 
This may need more work to have a reliable timer
This commit is contained in:
Christoph Oelckers 2020-08-31 00:16:43 +02:00
parent 7684f9e3e6
commit 007c6e122d
5 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/core/gamecontrol.cpp
View file

@ -96,7 +96,8 @@ GameInterface* gi;
int myconnectindex, numplayers; int myconnectindex, numplayers;
int connecthead, connectpoint2[MAXMULTIPLAYERS]; int connecthead, connectpoint2[MAXMULTIPLAYERS];
auto vsnprintfptr = vsnprintf; // This is an inline in Visual Studio but we need an address for it to satisfy the MinGW compiled libraries. auto vsnprintfptr = vsnprintf; // This is an inline in Visual Studio but we need an address for it to satisfy the MinGW compiled libraries.
int gameclock, gameclockstart; int gameclock;
uint64_t gameclockstart;
int lastTic; int lastTic;
int automapMode; int automapMode;

14
source/core/gamecontrol.h
View file

@ -9,6 +9,7 @@
#include "name.h" #include "name.h"
#include "memarena.h" #include "memarena.h"
#include "stats.h" #include "stats.h"
#include "i_time.h"
extern FString currentGame; extern FString currentGame;
extern FString LumpFilter; extern FString LumpFilter;
@ -223,5 +224,16 @@ extern int automapMode;
extern bool automapFollow; extern bool automapFollow;
extern bool sendPause; extern bool sendPause;
extern int gameclock; extern int gameclock;
extern int gameclockstart; extern uint64_t gameclockstart;
extern int lastTic; extern int lastTic;
inline void setGameClockStart()
{
gameclockstart = I_GetTimeNS();
gameclock = 0;
}
inline void updateGameClock()
{
gameclock = static_cast<int>((I_GetTimeNS() - gameclockstart) * 120 / 1'000'000'000);
}

4
source/core/mainloop.cpp
View file

@ -194,7 +194,7 @@ static void GameTicker()
case GS_LEVEL: case GS_LEVEL:
gameupdatetime.Reset(); gameupdatetime.Reset();
gameupdatetime.Clock(); gameupdatetime.Clock();
gameclock = I_GetBuildTime() - gameclockstart; updateGameClock();
gi->Ticker(); gi->Ticker();
gameupdatetime.Unclock(); gameupdatetime.Unclock();
break; break;
@ -248,7 +248,7 @@ void Display()
twod->Clear(); twod->Clear();
twod->SetSize(screen->GetWidth(), screen->GetHeight()); twod->SetSize(screen->GetWidth(), screen->GetHeight());
twodpsp.SetSize(screen->GetWidth(), screen->GetHeight()); twodpsp.SetSize(screen->GetWidth(), screen->GetHeight());
gameclock = I_GetBuildTime() - gameclockstart; updateGameClock();
gi->Render(); gi->Render();
DrawFullscreenBlends(); DrawFullscreenBlends();
} }

3
source/games/duke/src/gameloop.cpp
View file

@ -119,8 +119,7 @@ void GameInterface::Ticker()
void resetGameClock() void resetGameClock()
{ {
I_SetFrameTime(); I_SetFrameTime();
gameclockstart = I_GetBuildTime(); setGameClockStart();
gameclock = 0;
cloudclock = 0; cloudclock = 0;
} }

4
source/sw/src/game.cpp
View file

@ -728,7 +728,7 @@ void GameTicker(void)
ready2send = 1; ready2send = 1;
int const currentTic = I_GetTime(); int const currentTic = I_GetTime();
gameclock = I_GetBuildTime() - gameclockstart; updateGameClock();
if (paused) if (paused)
{ {
@ -775,7 +775,7 @@ void GameTicker(void)
void resetGameClock() void resetGameClock()
{ {
I_SetFrameTime(); I_SetFrameTime();
gameclockstart = I_GetBuildTime(); setGameClockStart();
ogameclock = gameclock = 0; ogameclock = gameclock = 0;
} }