From: FGSFDSFGS Date: Wed, 1 Mar 2017 15:08:54 +0000 (+0300) Subject: fucking tabs X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=60dcde1ed648f5ff1c55a4fe2f655d0b44d66b8f fucking tabs --- diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas index ad03070..80d26f2 100644 --- a/src/game/g_triggers.pas +++ b/src/game/g_triggers.pas @@ -1829,8 +1829,8 @@ begin 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; @@ -2501,7 +2501,7 @@ begin 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