summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 05:37:18 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-18 05:37:18 +0000
commitd95060f1e6fa1e397bc95ea43c239b3019e3fb2f (patch)
tree0e34e22426ce4e8479b07399a638aaf1089b60fd /crawl-ref/source
parent8a0f04d1b2864052bb65ab9ad667342178700f08 (diff)
downloadcrawl-ref-d95060f1e6fa1e397bc95ea43c239b3019e3fb2f.tar.gz
crawl-ref-d95060f1e6fa1e397bc95ea43c239b3019e3fb2f.zip
Disallowing travel to impassable terrain.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8534 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/travel.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 3dc2696ae7..7fcb6e3112 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -2627,6 +2627,10 @@ static int _find_transtravel_stair( const level_id &cur,
if (_is_excluded( stair, li.get_excludes() ))
return (-1);
+ // Can we even travel to this square?
+ if (!is_travelsafe_square(target.pos.x, target.pos.y, true))
+ return (-1);
+
// If there's no target position on the target level, or we're on the
// target, we're home.
if (target.pos.x == -1 || target.pos == stair)