Reimplement radius_iterator on the basis of circle_def.

1 files changed, 2 insertions, 17 deletions

diff --git a/crawl-ref/source/coord-circle.h b/crawl-ref/source/coord-circle.h
index 172e2600b6..9cf52acbe8 100644
--- a/crawl-ref/source/coord-circle.h
+++ b/crawl-ref/source/coord-circle.h
@@ -1,8 +1,6 @@
 #ifndef COORD_CIRCLE_H
 #define COORD_CIRCLE_H
 
-#include "coordit.h"
-
 enum shape_type
 {
     SH_SQUARE,     // square around an origin
@@ -17,6 +15,7 @@ enum circle_type
     C_ROUND
 };
 
+class rectangle_iterator;
 class rect_def
 {
     coord_def min;
@@ -51,6 +50,7 @@ public:
 
     bool contains(const coord_def &p) const;
     const rect_def& get_bbox() const;
+    const coord_def& get_center() const;
 
     circle_iterator iter() const;
 
@@ -58,19 +58,4 @@ private:
     void init(int param, circle_type ctype);
 };
 
-class circle_iterator
-{
-    const circle_def &circle;
-    rectangle_iterator iter;
-
-public:
-    circle_iterator(const circle_def &circle_);
-
-    operator bool() const;
-    coord_def operator*() const;
-
-    void operator++();
-    void operator++(int);
-};
-
 #endif