X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_monsters.pas;h=878d00df54fd550ab129c634a91405857b5b6635;hb=ad2c58b32ddcf077c5967b70e104851bb7852ad0;hp=a19fa4b568e5dbab3163ff1eb8d256b8c5234d82;hpb=e6a2ca524340877015dc54ec063f925989548a98;p=d2df-sdl.git diff --git a/src/game/g_monsters.pas b/src/game/g_monsters.pas index a19fa4b..878d00d 100644 --- a/src/game/g_monsters.pas +++ b/src/game/g_monsters.pas @@ -2,8 +2,7 @@ * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * the Free Software Foundation, version 3 of the License ONLY. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -4663,6 +4662,8 @@ begin if FMonsterType in [MONSTER_SOUL, MONSTER_VILE] then exit; // àð÷è íå ãîðÿò, ÷åðåïà óæå ãîðÿò if Timeout <= 0 then exit; + if g_Obj_CollidePanel(@FObj, 0, 0, PANEL_WATER or PANEL_ACID1 or PANEL_ACID2) then + exit; // íå ïîäãîðàåì â âîäå íà âñÿêèé ñëó÷àé if FFireTime <= 0 then g_Sound_PlayExAt('SOUND_IGNITE', FObj.X, FObj.Y); FFireTime := Timeout;