summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e6afeb)
raw | patch | inline | side by side (parent: 5e6afeb)
author | FGSFDSFGS <derp.primus@gmail.com> | |
Wed, 1 Mar 2017 15:08:54 +0000 (18:08 +0300) | ||
committer | FGSFDSFGS <derp.primus@gmail.com> | |
Wed, 1 Mar 2017 15:08:54 +0000 (18:08 +0300) |
src/game/g_triggers.pas | patch | blob | history |
index ad03070e45eb91cb4ccaaaf80a01ddf2f6382c30..80d26f2bc028f46bb7f6136cfbc750cbd6dd9ecc 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
if ShotSightTime > 0 then
Exit;
- // put this at the beginning so it doesn't trigger itself
- TimeOut := Data.ShotWait + 1;
+ // put this at the beginning so it doesn't trigger itself
+ TimeOut := Data.ShotWait + 1;
wx := Data.ShotPos.X;
wy := Data.ShotPos.Y;
for a := 0 to High(gTriggers) do
if (gTriggers[a].ID <> DWORD(IgnoreTrigger)) and
- (gTriggers[a].TriggerType <> TRIGGER_NONE) and
+ (gTriggers[a].TriggerType <> TRIGGER_NONE) and
(gTriggers[a].TimeOut = 0) and
((gTriggers[a].Keys and k) = gTriggers[a].Keys) and
ByteBool(gTriggers[a].ActivateType and ActivateType) then