added actor rendering interpolation; fixed vsync on startup

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

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 92c45168c620f9c1f450c3e5ffc650f1b20ad359..92084b1304662060019422a77096ad59f138a132 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -495,7 +495,7 @@ begin
   else
   begin
     plr.Respawn(False);
-    if gLMSRespawn = LMS_RESPAWN_WARMUP then
+    if gLMSRespawn > LMS_RESPAWN_NONE then
       MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime, 'N', C.ID);
   end;
 end;
@@ -595,7 +595,7 @@ begin
     begin
       if Pl.FSpectator then
       begin
-        if (gGameSettings.MaxLives = 0) or (gLMSRespawn = LMS_RESPAWN_WARMUP) then
+        if (gGameSettings.MaxLives = 0) or (gLMSRespawn > LMS_RESPAWN_NONE) then
           Pl.Respawn(False)
         else
           MH_SEND_GameEvent(NET_EV_LMS_NOSPAWN, Pl.UID);
@@ -1768,8 +1768,6 @@ begin
 
   gTime := EvTime;
 
-  e_LogWritefln('EVENT %d %d', [EvType, EvNum]);
-
   if (g_Res_received_map_start <> 0) then
   begin
     if (g_Res_received_map_start < 0) then exit;
@@ -2284,7 +2282,8 @@ begin
     GameVelY := M.ReadLongInt();
     GameAccelX := M.ReadLongInt();
     GameAccelY := M.ReadLongInt();
-    SetLerp(TmpX, TmpY);
+    GameX := TmpX;
+    GameY := TmpY;
     if NetForcePlayerUpdate then Update();
   end;
 end;
@@ -2346,12 +2345,12 @@ begin
     FSpectator := M.ReadByte() <> 0;
     if FSpectator then
     begin
-      if Pl = gPlayer1 then
+      if UID = NetPlrUID1 then
       begin
         gSpectLatchPID1 := UID;
         gPlayer1 := nil;
       end;
-      if Pl = gPlayer2 then
+      if UID = NetPlrUID2 then
       begin
         gSpectLatchPID2 := UID;
         gPlayer2 := nil;