diff options
| author | Haran Pilpel <haranp@users.sourceforge.net> | 2010-01-13 12:10:12 +0200 |
|---|---|---|
| committer | Haran Pilpel <haranp@users.sourceforge.net> | 2010-01-13 12:10:12 +0200 |
| commit | 0006e0fb40608e22da90142cb8646cb67fafb3e5 (patch) | |
| tree | 18875b6728cf0c310de236b7c2ccf1b6d9eff003 /crawl-ref | |
| parent | 526626fe4e3c9bd87234d9b8701a5cfdb19ad7b8 (diff) | |
| parent | 45145bc51b510e88c13f495bc3bed90ce48abf1d (diff) | |
| download | crawl-ref-0006e0fb40608e22da90142cb8646cb67fafb3e5.tar.gz crawl-ref-0006e0fb40608e22da90142cb8646cb67fafb3e5.zip | |
Merge branch 'master' of ssh://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/exclude.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/viewmap.cc | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc index fe1f604ffa..f0e65caaaf 100644 --- a/crawl-ref/source/exclude.cc +++ b/crawl-ref/source/exclude.cc @@ -302,7 +302,7 @@ exclude_set::const_iterator exclude_set::end() const exclude_set::iterator exclude_set::begin() { - return exclude_roots.end(); + return exclude_roots.begin(); } exclude_set::iterator exclude_set::end() diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc index bfb7c6de09..1760620eb1 100644 --- a/crawl-ref/source/viewmap.cc +++ b/crawl-ref/source/viewmap.cc @@ -412,10 +412,7 @@ static void _reset_travel_colours(std::vector<coord_def> &features, features.clear(); if (on_level) - { - find_travel_pos((on_level ? you.pos() : coord_def()), - NULL, NULL, &features); - } + find_travel_pos(you.pos(), NULL, NULL, &features); else { travel_pathfind tp; |