put network interp back in

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 92084b1304662060019422a77096ad59f138a132..5e95a6a57dd97b42a4d31178c153e94589092816 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -2282,8 +2282,7 @@ begin
     GameVelY := M.ReadLongInt();
     GameAccelX := M.ReadLongInt();
     GameAccelY := M.ReadLongInt();
-    GameX := TmpX;
-    GameY := TmpY;
+    SetLerp(TmpX, TmpY);
     if NetForcePlayerUpdate then Update();
   end;
 end;

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 068c2b4124e41fe4d225a6dd4685666797c1300c..3e30f6378a3799c73b26979ee9426c400149be2c 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -5069,8 +5069,11 @@ begin
   NetServer := g_Game_IsNet and g_Game_IsServer;
   AnyServer := g_Game_IsServer;
 
-  if FGhost then
-    DoLerp(4);
+  if g_Game_IsClient and (NetInterpLevel > 0) then
+    DoLerp(NetInterpLevel + 1)
+  else
+    if FGhost then
+      DoLerp(4);
 
   if NetServer then
     if FClientID >= 0 then