X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_triggers.pas;h=8c11a474ff3928ea8466b19897f375993a360b49;hb=67d37ea13feeca0671d60d88b1963cf1e0e901c4;hp=f8e9e02dcef20c79c8806218c459f79aa8056a93;hpb=a0e1ce4f7986812acc44a4169d2daf8559c89973;p=d2df-sdl.git diff --git a/src/game/g_triggers.pas b/src/game/g_triggers.pas index f8e9e02..8c11a47 100644 --- a/src/game/g_triggers.pas +++ b/src/game/g_triggers.pas @@ -2105,7 +2105,7 @@ begin begin // Êèñëîòíûé óðîí íå íàíîñèòñÿ êîãäà åñòü êîñòþì // "Âîäÿíîé" óðîí íå íàíîñèòñÿ êîãäà åñòü êèñëîðîä - if not (((tgcKind = HIT_ACID) and (p.FMegaRulez[MR_SUIT] > gTime)) or + if not (((tgcKind = HIT_ACID) and (p.FPowerups[MR_SUIT] > gTime)) or ((tgcKind = HIT_WATER) and (p.Air > 0))) then p.Damage(tgcAmount, 0, 0, 0, tgcKind); if (tgcKind = HIT_FLAME) then p.CatchFire(0);