Apply my previous commit to trunk: plants/fungi not triggering conducts.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10190 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 7 deletions

diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index 6768d44cba..a46995b4d6 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);
 }