don't hit monsters on the client when it's warmup time

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index 3949fe93e8a6036274670ca635e1f6bf6dec6140..498487da73d4acd8862ebf74841bb33479940ad3 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
     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
     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;
 
 
 end;