Fix max_radius in distance_iterator, rename it again, allow querying current radius.

1 files changed, 7 insertions, 6 deletions

diff --git a/crawl-ref/source/coordit.h b/crawl-ref/source/coordit.h
index dbfff64b01..505f482f3e 100644
--- a/crawl-ref/source/coordit.h
+++ b/crawl-ref/source/coordit.h
@@ -88,15 +88,15 @@ public:
     radius_iterator(pos, 1, C_SQUARE, NULL, _exclude_center) {}
 };
 
-/* equidistant_iterator: Iterates over coordinates in integer ranges.  Unlike other
+/* distance_iterator: Iterates over coordinates in integer ranges.  Unlike other
  *                  iterators, it tries hard to not favorize any particular
  *                  direction (unless fair = false, when it saves some CPU).
  */
-class equidistant_iterator :
+class distance_iterator :
     public std::iterator<std::forward_iterator_tag, coord_def>
 {
 public:
-    equidistant_iterator(const coord_def& _center,
+    distance_iterator(const coord_def& _center,
                     bool _fair = true,
                     bool exclude_center = true,
                     int _max_radius = 107);
@@ -104,12 +104,13 @@ public:
     coord_def operator *() const;
     const coord_def* operator->() const;
 
-    const equidistant_iterator& operator ++();
-    equidistant_iterator operator ++(int);
+    const distance_iterator& operator ++();
+    distance_iterator operator ++(int);
+    int radius() const;
 private:
     coord_def center, current;
     std::vector<coord_def> lists[3], *vcur, *vnear, *vfar;
-    int radius, max_radius;
+    int r, max_radius;
     int threshold;
     unsigned int icur, iend;
     bool fair;