network now always ticks at 36 tick

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 3e30f6378a3799c73b26979ee9426c400149be2c..925f4ce55c6926bcd969f8b52779d2dc19e05308 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -1437,6 +1437,8 @@ begin
   e_TextureFontPrint(0, fH * 3, 'Vel Y: ' + IntToStr(p.FObj.Vel.Y), gStdFont);
   e_TextureFontPrint(0, fH * 4, 'Acc X: ' + IntToStr(p.FObj.Accel.X), gStdFont);
   e_TextureFontPrint(0, fH * 5, 'Acc Y: ' + IntToStr(p.FObj.Accel.Y), gStdFont);
+  e_TextureFontPrint(0, fH * 6, 'Old X: ' + IntToStr(p.FObj.oldX), gStdFont);
+  e_TextureFontPrint(0, fH * 7, 'Old Y: ' + IntToStr(p.FObj.oldY), gStdFont);
 end;
 
 procedure g_Player_DrawHealth();
@@ -3422,6 +3424,9 @@ begin
   end;
   FShellTimer := -1;
 
+  // have to do this to avoid death tremors
+  PreUpdate();
+
   if (gGameSettings.MaxLives > 0) and Srv and (gLMSRespawn = LMS_RESPAWN_NONE) then
   begin
     if FLives > 0 then FLives := FLives - 1;
@@ -5751,6 +5756,8 @@ procedure TPlayer.SetLerp(XTo, YTo: Integer);
 var
   AX, AY: Integer;
 begin
+  FXTo := XTo;
+  FYTo := YTo;
   if NetInterpLevel < 1 then
   begin
     FObj.X := XTo;
@@ -5758,9 +5765,6 @@ begin
   end
   else
   begin
-    FXTo := XTo;
-    FYTo := YTo;
-
     AX := Abs(FXTo - FObj.X);
     AY := Abs(FYTo - FObj.Y);
     if (AX > 32) or (AX <= NetInterpLevel) then

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index f55c43001f90849c064bfc3a98b9dac28370322f..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();