From bce5f7020a13edbceb605979a3b73fdfe590a0cf Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Tue, 1 Dec 2009 12:09:07 +0100 Subject: Make passwall use standard targetting system. This means it's properly abortable now. --- crawl-ref/source/spl-cast.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/spl-cast.cc') diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 9f73adf013..e35944c8ce 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -195,6 +195,7 @@ static bool _spell_no_hostile_in_range(spell_type spell, int minRange) case SPELL_PROJECTED_NOISE: case SPELL_CONJURE_FLAME: case SPELL_DIG: + case SPELL_PASSWALL: // Airstrike has LOS_RANGE and can go through glass walls. case SPELL_AIRSTRIKE: @@ -2192,7 +2193,8 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) break; case SPELL_PASSWALL: - cast_passwall(powc); + if (!cast_passwall(spd.delta, powc)) + return (SPRET_ABORT); break; case SPELL_APPORTATION: -- cgit v1.2.3-54-g00ecf