X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_game.pas;h=f4486028795f4f80134a47d33b5de80b517f9f53;hp=bc645b0a57fd12de70a6888d4e8c4c32ec9c52fd;hb=11b921b75f679ec727a0af28a6499bbaba17eca2;hpb=4e51e140c0b57225fddec5c839cecf3f3cdec9cc

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index bc645b0..f448602 100644
--- 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;