summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 910c7e1)
raw | patch | inline | side by side (parent: 910c7e1)
author | fgsfds <pvt.fgsfds@gmail.com> | |
Thu, 27 Feb 2020 18:11:47 +0000 (21:11 +0300) | ||
committer | fgsfds <pvt.fgsfds@gmail.com> | |
Thu, 27 Feb 2020 18:11:47 +0000 (21:11 +0300) |
src/game/g_weapons.pas | patch | blob | history |
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
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;