From: Ketmar Dark Date: Fri, 15 Apr 2016 15:10:36 +0000 (+0300) Subject: we don't really need microsecond resolution in timer X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=9abb24523fd7fcb7778fda5920f7d0b39175eb61 we don't really need microsecond resolution in timer --- diff --git a/src/game/g_game.pas b/src/game/g_game.pas index d369831..3bb18b7 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -653,7 +653,7 @@ begin gDelayedEvents[n].DENum := Num; gDelayedEvents[n].DEStr := Str; if DEType = DE_GLOBEVENT then - gDelayedEvents[n].Time := (GetTimer() div 1000) + Time + gDelayedEvents[n].Time := (GetTimer() {div 1000}) + Time else gDelayedEvents[n].Time := gTime + Time; Result := n; @@ -1753,7 +1753,7 @@ begin // Äåëàåì ñêðèíøîò (íå ÷àùå 200 ìèëëèñåêóíä): if e_KeyPressed(gGameControls.GameControls.TakeScreenshot) then - if (GetTimer()-LastScreenShot) > 200000 then + if (GetTimer()-LastScreenShot) > 200000 div 1000 then begin g_TakeScreenShot(); LastScreenShot := GetTimer(); @@ -1768,7 +1768,7 @@ begin KeyPress(IK_F10); end; - Time := GetTimer() div 1000; + Time := GetTimer() {div 1000}; // Îáðàáîòêà îòëîæåííûõ ñîáûòèé: if gDelayedEvents <> nil then @@ -2684,7 +2684,7 @@ var begin if gExit = EXIT_QUIT then Exit; - Time := GetTimer() div 1000; + Time := GetTimer() {div 1000}; FPSCounter := FPSCounter+1; if Time - FPSTime >= 1000 then begin diff --git a/src/game/g_netmaster.pas b/src/game/g_netmaster.pas index a1b9b6f..e0eed50 100644 --- a/src/game/g_netmaster.pas +++ b/src/game/g_netmaster.pas @@ -68,7 +68,7 @@ var function GetTimerMS(): Integer; begin - Result := GetTimer() div 1000; + Result := GetTimer() {div 1000}; end; procedure PingServer(var S: TNetServer; Sock: ENetSocket); diff --git a/src/game/g_window.pas b/src/game/g_window.pas index ef1d362..419e135 100644 --- a/src/game/g_window.pas +++ b/src/game/g_window.pas @@ -425,7 +425,7 @@ end; function GetTimer(): Int64; begin - Result := SDL_GetTicks() * 1000; // TODO: do we really need microseconds here? + Result := SDL_GetTicks() {* 1000}; // TODO: do we really need microseconds here? k8: NOPE! end; procedure ResetTimer(); @@ -506,11 +506,11 @@ begin if wNeedTimeReset then begin - Time_Delta := 27777; + Time_Delta := (27777 div 1000); wNeedTimeReset := False; end; - t := Time_Delta div 27777; + t := Time_Delta div (27777 div 1000); if t > 0 then begin flag := True; @@ -542,7 +542,7 @@ begin // Âðåìÿ ïðåäûäóùåãî îáíîâëåíèÿ: if flag then begin - Time_Old := Time - (Time_Delta mod 27777); + Time_Old := Time - (Time_Delta mod (27777 div 1000)); if (not wMinimized) then begin Draw();