host can't spawn during an LMS round anymore

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index bc645b0a57fd12de70a6888d4e8c4c32ec9c52fd..f4486028795f4f80134a47d33b5de80b517f9f53 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -4251,6 +4251,10 @@ begin
   if ((not gGameOn) and (gState <> STATE_INTERCUSTOM))
   or (not (gGameSettings.GameType in [GT_CUSTOM, GT_SERVER, GT_CLIENT])) then
     Exit;
+
+  if (gGameSettings.MaxLives > 0) and (gLMSRespawn = LMS_RESPAWN_NONE) then
+    Exit;
+
   if gPlayer1 = nil then
   begin
     if g_Game_IsClient then
@@ -5220,6 +5224,8 @@ begin
     gLMSRespawn := LMS_RESPAWN_WARMUP;
     gLMSRespawnTime := gTime + gGameSettings.WarmupTime*1000;
     gLMSSoftSpawn := NoMapRestart;
+    if g_Game_IsNet then
+      MH_SEND_GameEvent(NET_EV_LMS_WARMUP, gLMSRespawnTime - gTime);
     Exit;
   end;
 

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 57e51369af7a7d2f7f701b6a3e3bd79b8a39fcc3..5e95a6a57dd97b42a4d31178c153e94589092816 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -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);
@@ -2344,12 +2344,12 @@ begin
     FSpectator := M.ReadByte() <> 0;
     if FSpectator then
     begin
-      if PID = NetPlrUID1 then
+      if UID = NetPlrUID1 then
       begin
         gSpectLatchPID1 := UID;
         gPlayer1 := nil;
       end;
-      if PID = NetPlrUID2 then
+      if UID = NetPlrUID2 then
       begin
         gSpectLatchPID2 := UID;
         gPlayer2 := nil;