From 552a18061460342af014e69c7cee26bb5bf358ef Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 25 Jul 2009 12:36:43 +0000 Subject: * Add support for packaging save files with tar. (Patch by Trent W. Buck.) * Fix random blink placing the player in dangerous clouds. * Fix message when trying to place Conjure Flame in a wax wall. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10397 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/item_use.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/item_use.cc') diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 0edf5d15a0..6f9739d703 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1793,18 +1793,21 @@ static bool _dispersal_hit_victim(bolt& beam, actor* victim, int dmg, int tries = 0; do { - if (!random_near_space(victim->pos(), pos, false, true, no_sanct)) + if (!random_near_space(victim->pos(), pos, false, true, false, + no_sanct)) + { return (false); - } while (!victim->is_habitable(pos) && tries++ < 100); + } + } + while (!victim->is_habitable(pos) && tries++ < 100); if (!victim->is_habitable(pos)) return (false); tries = 0; do - { - random_near_space(victim->pos(), pos2, false, true, no_sanct); - } while (!victim->is_habitable(pos2) && tries++ < 100); + random_near_space(victim->pos(), pos2, false, true, false, no_sanct); + while (!victim->is_habitable(pos2) && tries++ < 100); if (!victim->is_habitable(pos2)) return (false); -- cgit v1.2.3-54-g00ecf