summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/traps.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/traps.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/traps.cc')
-rw-r--r--crawl-ref/source/traps.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index ced11f2d1f..216901f4f1 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -175,18 +175,18 @@ bool trap_def::is_known(const actor* act) const
// Returns the number of a net on a given square.
-// If trapped only stationary ones are counted
+// If trapped, only stationary ones are counted
// otherwise the first net found is returned.
int get_trapping_net(const coord_def& where, bool trapped)
{
for (stack_iterator si(where); si; ++si)
{
- if (si->base_type == OBJ_MISSILES
- && si->sub_type == MI_THROWING_NET
- && (!trapped || item_is_stationary(*si)))
- {
- return (si->index());
- }
+ if (si->base_type == OBJ_MISSILES
+ && si->sub_type == MI_THROWING_NET
+ && (!trapped || item_is_stationary(*si)))
+ {
+ return (si->index());
+ }
}
return (NON_ITEM);
}