index f8e9e02dcef20c79c8806218c459f79aa8056a93..3a1bec2ccbf37a95c84c49de76b6da6bc45c10c0 100644 (file)
--- a/src/game/g_triggers.pas
+++ b/src/game/g_triggers.pas
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);
// Íå ñîçäàâàòü âûõîä, åñëè èãðà áåç âûõîäà
if (aTrigger.TriggerType = TRIGGER_EXIT) and
- (not LongBool(gGameSettings.Options and GAME_OPTION_ALLOWEXIT)) then
+ (not (TGameOption.ALLOW_EXIT in gGameSettings.Options)) then
begin
aTrigger.TriggerType := TRIGGER_NONE;
end;
// Åñëè ìîíñòðû çàïðåùåíû, îòìåíÿåì òðèããåð
if (aTrigger.TriggerType = TRIGGER_SPAWNMONSTER) and
- (not LongBool(gGameSettings.Options and GAME_OPTION_MONSTERS)) and
+ (not (TGameOption.MONSTERS in gGameSettings.Options)) and
(gGameSettings.GameType <> GT_SINGLE) then
begin
aTrigger.TriggerType := TRIGGER_NONE;