A few more cleanups.

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

1 files changed, 5 insertions, 9 deletions

diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index d321f6e860..5822d624f3 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -49,17 +49,13 @@ static void dart_trap(bool trap_known, int trapped, bolt &pbolt, bool poison);
 // otherwise the first net found is returned.
 int get_trapping_net(int x, int y, bool trapped)
 {
-    int net, next;
-
-    for (net = igrd[x][y]; net != NON_ITEM; net = next)
+    for (stack_iterator si(coord_def(x,y)); si; ++si)
     {
-         next = mitm[net].link;
-
-         if (mitm[net].base_type == OBJ_MISSILES
-             && mitm[net].sub_type == MI_THROWING_NET
-             && (!trapped || item_is_stationary(mitm[net])))
+         if (si->base_type == OBJ_MISSILES
+             && si->sub_type == MI_THROWING_NET
+             && (!trapped || item_is_stationary(*si)))
          {
-             return (net);
+             return (si->index());
          }
     }
     return (NON_ITEM);