Merge branch 'master' into next

This commit is contained in:
Monster Iestyn 2019-03-01 16:23:51 +00:00
commit 008b0bf560

View file

@ -2045,8 +2045,8 @@ static void I_ShutdownTimer(void)
//
tic_t I_GetTime (void)
{
static Uint32 basetime = 0;
Uint32 ticks = SDL_GetTicks();
static Uint64 basetime = 0;
Uint64 ticks = SDL_GetTicks();
if (!basetime)
basetime = ticks;