summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/travel.cc
diff options
context:
space:
mode:
authorharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-14 18:41:47 +0000
committerharanp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-14 18:41:47 +0000
commit262dc833c67e41da6f70a5f5281a1258922d36f5 (patch)
treef94d044d501e3ee70cf6081e711e16fc63f65055 /crawl-ref/source/travel.cc
parent08a97b0cc6bcbfd814c6faf699f04839c23aaded (diff)
downloadcrawl-ref-262dc833c67e41da6f70a5f5281a1258922d36f5.tar.gz
crawl-ref-262dc833c67e41da6f70a5f5281a1258922d36f5.zip
Fix nasty bug that I introduced in r9012: dungeon generation was relying
on travel, so in those cases travel *should* know everything about the level. Fixes [2596125] and unbreaks cdo. Sorry about that. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9071 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/travel.cc')
-rw-r--r--crawl-ref/source/travel.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 584e6c5e63..e0b4775bab 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -552,7 +552,8 @@ bool is_travelsafe_square(int x, int y, bool ignore_hostile,
return (false);
const bool seen = see_grid(x,y);
- const int grid = (seen ? grd[x][y] : get_envmap_obj(x,y));
+ const int grid = ((seen || ignore_terrain_knowledge) ? grd[x][y]
+ : get_envmap_obj(x,y));
// FIXME: this compares to the *real* monster at the square,
// even if the one we've seen is different.