generalize warmup stuff

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

diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas
index e7ee1d0eb784275870b6aa872acb8158049d3256..ac28f340a08b8fcd694d0aee764a53a32b086c4c 100644 (file)
--- a/src/game/g_monsters.pas
+++ b/src/game/g_monsters.pas
@@ -1994,7 +1994,7 @@ begin
   Result := False;
 
 // Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
-  if (gLMSRespawn = LMS_RESPAWN_WARMUP) then exit;
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
 
 // Óìèðàåò, óìåð èëè âîñêðåøàåòñÿ => óðîí äåëàòü íåêîìó:
   if (FState = MONSTATE_DEAD) or (FState = MONSTATE_DIE) or (FState = MONSTATE_REVIVE) then
@@ -2454,7 +2454,7 @@ begin
   fall := True;
 
 // Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
-  if (gLMSRespawn = LMS_RESPAWN_WARMUP) then exit;
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
 
 // Ðûáû "ëåòàþò" òîëüêî â âîäå:
   if FMonsterType = MONSTER_FISH then
@@ -3447,7 +3447,7 @@ begin
   fall := True;
 
 // Ìîíñòð ñòàòè÷åí ïîêà èäåò warmup
-  if (gLMSRespawn = LMS_RESPAWN_WARMUP) then exit;
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
 
 // Ðûáû "ëåòàþò" òîëüêî â âîäå:
   if FMonsterType = MONSTER_FISH then