network now always ticks at 36 tick

[d2df-sdl.git] / src / game / g_window.pas

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index 351edf913e91396a154c5ae8a5c52a08cf32c5e2..5d1c59476562a51e5857173ed10021712e2580f1 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -143,11 +143,6 @@ begin
       else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
       Update();
     end;
-  end
-  else
-  begin
-         if (NetMode = NET_SERVER) then g_Net_Host_Update()
-    else if (NetMode = NET_CLIENT) then g_Net_Client_Update();
   end;
 
   if NetMode = NET_SERVER then g_Net_Flush();
@@ -171,7 +166,11 @@ begin
   if flag then
     Time_Old := Time - (Time_Delta mod 28);
 
-  if (Time - Frame > 4) then
+  // don't wait if VSync is on, GL already probably waits enough
+  if gLerpActors then
+    flag := (Time - Frame >= gFrameTime) or gVSync;
+
+  if flag then
   begin
     if (not wMinimized) then
     begin