summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/beam.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-12 16:14:37 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-12 16:14:37 +0000
commit0e8c71ba48ff332db6de8f37a2392b374ecadfe3 (patch)
tree1e746c37da6520df3e484138dc92ba5bc9d06973 /crawl-ref/source/beam.cc
parentf8aae176b973c33cc6e26a97f33198f781a2e2b8 (diff)
downloadcrawl-ref-0e8c71ba48ff332db6de8f37a2392b374ecadfe3.tar.gz
crawl-ref-0e8c71ba48ff332db6de8f37a2392b374ecadfe3.zip
Killing plants and fungi doesn't trigger divine conducts anymore, e.g.
power/hp gain or blessings of followers. (Fixes 2818253.) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@10189 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r--crawl-ref/source/beam.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index bb4c087ac6..365d48dd24 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -2923,7 +2923,7 @@ void bolt::drop_object()
if (item->sub_type == MI_THROWING_NET)
{
monsters* m = monster_at(pos());
- // Player or monster on position is caught in net.
+ // Player or monster at position is caught in net.
if (you.pos() == pos() && you.attribute[ATTR_HELD]
|| m && mons_is_caught(m))
{
@@ -2932,7 +2932,6 @@ void bolt::drop_object()
set_item_stationary(*item);
}
}
-
copy_item_to_grid(*item, pos(), 1);
}
}
@@ -3441,7 +3440,7 @@ bool bolt::misses_player()
return (false);
const int dodge = player_evasion();
- int real_tohit = hit;
+ int real_tohit = hit;
// Monsters shooting at an invisible player are very inaccurate.
if (you.invisible() && !can_see_invis)