Merge branch 'master' into next

This commit is contained in:
wolfy852 2019-03-01 00:13:47 -06:00
commit 8e51cb18ba

View file

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