X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=498487da73d4acd8862ebf74841bb33479940ad3;hp=3949fe93e8a6036274670ca635e1f6bf6dec6140;hb=bb372b938915897588166427301cce8ea4be44d3;hpb=910c7e1b07e907561ba67d61b53bb49dd9f175e1

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 3949fe9..498487d 100644
--- 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 := True;
+      Result := (gLMSRespawn <> LMS_RESPAWN_WARMUP); // don't hit monsters when it's warmup time
     if t = HIT_FLAME then
       m.CatchFire(SpawnerUID);
   end
   else
-    Result := True;
+    Result := (gLMSRespawn <> LMS_RESPAWN_WARMUP); // don't hit monsters when it's warmup time
 end;