[2523860] Fixing interlevel travel again.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8712 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 6 insertions, 7 deletions

diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 45d136d0dc..6d569f1462 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -2627,13 +2627,6 @@ 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 (in_bounds(target.pos)
-            && !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)
@@ -2948,6 +2941,12 @@ void start_travel(const coord_def& p)
     if (!i_feel_safe(true, true))
         return;
 
+    // Can we even travel to this square?
+    if (!in_bounds(p))
+        return;
+    if (!is_travelsafe_square(p.x, p.y, true))
+        return;
+
     you.running.pos = p;
     level_target  = level_pos(level_id::current(), p);