diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 6c3137a229e3ff97d34e34166271c13ef67a26a3..92084b1304662060019422a77096ad59f138a132 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
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;
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);
GameVelY := M.ReadLongInt();
GameAccelX := M.ReadLongInt();
GameAccelY := M.ReadLongInt();
- SetLerp(TmpX, TmpY);
+ GameX := TmpX;
+ GameY := TmpY;
if NetForcePlayerUpdate then Update();
end;
end;
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;