generalize warmup stuff

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

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 6c3137a229e3ff97d34e34166271c13ef67a26a3..c2e379b76d25e2b6890ed70f77dd52f8211c2306 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -495,7 +495,7 @@ begin
   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;

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index d9dd8871a953815a003809dbeacb6d231539f1e7..30a71f18306d98e7b0b79486399b0323284ee28d 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -2766,7 +2766,7 @@ begin
       e_CharFont_PrintEx(gMenuSmallFont, X-16-tw, Y+32, s, _RGB(255, 0, 0));
     end;
 
-    if gLMSRespawn = LMS_RESPAWN_WARMUP then
+    if gLMSRespawn > LMS_RESPAWN_NONE then
     begin
       s := _lc[I_GAME_WARMUP];
       e_CharFont_GetSize(gMenuFont, s, tw, th);

diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas
index 3cfca16904004997968584ee954eefc307e92c79..55057b622a11f6b54475ee9d4265d580a7312097 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
@@ -1224,7 +1224,7 @@ begin
 
   if not Trigger.Enabled then exit;
   if (Trigger.TimeOut <> 0) and (actType <> ACTIVATE_CUSTOM) then exit;
-  if (gLMSRespawn = LMS_RESPAWN_WARMUP) then exit;
+  if (gLMSRespawn > LMS_RESPAWN_NONE) then exit;
 
   if (Trigger.exoCheck <> nil) then
   begin

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 498487da73d4acd8862ebf74841bb33479940ad3..632cb1344c3e4728f37478e4e683e1d1ac652cb0 100644 (file)
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -461,12 +461,12 @@ begin
     if (t <> HIT_FLAME) or (m.FFireTime = 0) or (vx <> 0) or (vy <> 0) then
       Result := m.Damage(d, vx, vy, SpawnerUID, t)
     else
-      Result := (gLMSRespawn <> LMS_RESPAWN_WARMUP); // don't hit monsters when it's warmup time
+      Result := (gLMSRespawn = LMS_RESPAWN_NONE); // don't hit monsters when it's warmup time
     if t = HIT_FLAME then
       m.CatchFire(SpawnerUID);
   end
   else
-    Result := (gLMSRespawn <> LMS_RESPAWN_WARMUP); // don't hit monsters when it's warmup time
+    Result := (gLMSRespawn = LMS_RESPAWN_NONE); // don't hit monsters when it's warmup time
 end;