X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_monsters.pas;h=ac28f340a08b8fcd694d0aee764a53a32b086c4c;hb=394c23a23c27da078c7337f6e963fcb9ef9e0a5a;hp=a70364bca6a7e4c4c512dc7fb6081c3d48c1cbf3;hpb=bba5c4a7b77b3be25c3b872b21c96e28a57cee32;p=d2df-sdl.git

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index a70364b..ac28f34 100644
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1994,6 +1993,9 @@ var
 begin
   Result := False;
 
+// Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
+
 // Óìèðàåò, óìåð èëè âîñêðåøàåòñÿ => óðîí äåëàòü íåêîìó:
   if (FState = MONSTATE_DEAD) or (FState = MONSTATE_DIE) or (FState = MONSTATE_REVIVE) then
     Exit;
@@ -2451,6 +2453,9 @@ label
 begin
   fall := True;
 
+// Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
+
 // Ðûáû "ëåòàþò" òîëüêî â âîäå:
   if FMonsterType = MONSTER_FISH then
     if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then
@@ -3440,6 +3445,10 @@ begin
   sx := 0; // SHUT UP COMPILER
   sy := 0;
   fall := True;
+
+// Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
+
 // Ðûáû "ëåòàþò" òîëüêî â âîäå:
   if FMonsterType = MONSTER_FISH then
     if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then