diff options
author | Adam Borowski <kilobyte@angband.pl> | 2010-11-04 12:02:39 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2010-11-04 12:02:39 +0100 |
commit | c438898a13c1211d5e0a935089df0973595a66cd (patch) | |
tree | 15cd6826aa4960c29f3e45bdd678a4f25126455b /crawl-ref/source/coordit.cc | |
parent | 5463161aea273fe8090bbc5aca200983bfc2f3a6 (diff) | |
download | crawl-ref-c438898a13c1211d5e0a935089df0973595a66cd.tar.gz crawl-ref-c438898a13c1211d5e0a935089df0973595a66cd.zip |
s/spiral_iterator/equidistant_iterator/g (dpeg)
Diffstat (limited to 'crawl-ref/source/coordit.cc')
-rw-r--r-- | crawl-ref/source/coordit.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/coordit.cc b/crawl-ref/source/coordit.cc index 0a43b0f2bf..f50beb2dd0 100644 --- a/crawl-ref/source/coordit.cc +++ b/crawl-ref/source/coordit.cc @@ -186,7 +186,7 @@ radius_iterator radius_iterator::operator++(int dummy) /* * spiral iterator */ -spiral_iterator::spiral_iterator(const coord_def& _center, bool _fair, +equidistant_iterator::equidistant_iterator(const coord_def& _center, bool _fair, bool exclude_center, int _max_radius) : center(_center), current(_center), radius(1), max_radius(_max_radius), threshold(0), icur(0), iend(0), fair(_fair) @@ -209,7 +209,7 @@ static inline int sgn(int x) return (x < 0) ? -1 : (x > 0) ? 1 : 0; } -bool spiral_iterator::advance() +bool equidistant_iterator::advance() { again: if (++icur >= vcur->size()) @@ -267,37 +267,37 @@ again: return true; } -void spiral_iterator::push_neigh(coord_def d, int dx, int dy) +void equidistant_iterator::push_neigh(coord_def d, int dx, int dy) { d.x += dx; d.y += dy; ((d.abs() <= threshold) ? vnear : vfar)->push_back(d); } -spiral_iterator::operator bool() const +equidistant_iterator::operator bool() const { return in_bounds(current); } -coord_def spiral_iterator::operator *() const +coord_def equidistant_iterator::operator *() const { return current; } -const coord_def* spiral_iterator::operator->() const +const coord_def* equidistant_iterator::operator->() const { return ¤t; } -const spiral_iterator& spiral_iterator::operator++() +const equidistant_iterator& equidistant_iterator::operator++() { advance(); return *this; } -spiral_iterator spiral_iterator::operator++(int dummy) +equidistant_iterator equidistant_iterator::operator++(int dummy) { - const spiral_iterator copy = *this; + const equidistant_iterator copy = *this; ++(*this); return (copy); } |