Finally implemented stack_iterator(), a way to iterate over objects in

a stack without all that o = mitm[o].link stuff. Redid Ely's destroy
weapons power to use it.


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

1 files changed, 49 insertions, 0 deletions

diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc
index d2e1fbb52e..ea171db473 100644
--- a/crawl-ref/source/stuff.cc
+++ b/crawl-ref/source/stuff.cc
@@ -77,6 +77,55 @@
 #include "tutorial.h"
 #include "view.h"
 
+stack_iterator::stack_iterator(const coord_def& pos)
+{
+    cur_link = igrd(pos);
+    if ( cur_link != NON_ITEM )
+        next_link = mitm[cur_link].link;
+    else
+        next_link = NON_ITEM;
+}
+
+stack_iterator::stack_iterator(int start_link)
+{
+    cur_link = start_link;
+    if ( cur_link != NON_ITEM )
+        next_link = mitm[cur_link].link;
+    else
+        next_link = NON_ITEM;
+}
+
+stack_iterator::operator bool() const
+{
+    return ( cur_link != NON_ITEM );
+}
+
+item_def& stack_iterator::operator*() const
+{
+    ASSERT( cur_link != NON_ITEM );
+    return mitm[cur_link];
+}
+
+int stack_iterator::link() const
+{
+    return cur_link;
+}
+
+const stack_iterator& stack_iterator::operator ++ ()
+{
+    cur_link = next_link;
+    if ( cur_link != NON_ITEM )
+        next_link = mitm[cur_link].link;
+    return *this;
+}
+
+stack_iterator stack_iterator::operator++(int dummy)
+{
+    const stack_iterator copy = *this;
+    ++(*this);
+    return copy;
+}
+
 radius_iterator::radius_iterator( const coord_def& _center, int _radius,
                                   bool _roguelike_metric, bool _require_los,
                                   bool _exclude_center )