summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/coordit.h
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2009-11-07 23:13:30 +0100
committerRobert Vollmert <rvollmert@gmx.net>2009-11-08 01:31:41 +0100
commit05c8dfaba3d73566693df38b1e170c803e016842 (patch)
tree95347ff95d893e30a2c3101ba074c1a4e570bec2 /crawl-ref/source/coordit.h
parent5a1a9596b2b2d2d36df854fbea7adb6d4bb8c605 (diff)
downloadcrawl-ref-05c8dfaba3d73566693df38b1e170c803e016842.tar.gz
crawl-ref-05c8dfaba3d73566693df38b1e170c803e016842.zip
Remove player.h dependency from coordit.h.
adjacent_iterator had a default center of you.pos(), which is now gone (also the uses of). I was running into circular header dependencies with actor.h including los_def.h including coordit.h including player.h including actor.h.
Diffstat (limited to 'crawl-ref/source/coordit.h')
-rw-r--r--crawl-ref/source/coordit.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/coordit.h b/crawl-ref/source/coordit.h
index ecf57fad53..d4624c9ec7 100644
--- a/crawl-ref/source/coordit.h
+++ b/crawl-ref/source/coordit.h
@@ -1,8 +1,6 @@
#ifndef COORDIT_H
#define COORDIT_H
-#include "player.h"
-
class rectangle_iterator :
public std::iterator<std::forward_iterator_tag, coord_def>
{
@@ -50,7 +48,7 @@ private:
class adjacent_iterator : public radius_iterator
{
public:
- explicit adjacent_iterator( const coord_def& pos = you.pos(),
+ explicit adjacent_iterator( const coord_def& pos,
bool _exclude_center = true ) :
radius_iterator(pos, 1, true, false, _exclude_center) {}
};