summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/travel.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-30 15:53:09 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2007-09-30 15:53:09 +0000
commite2179589b89a1d9786aa3111286af81878d21219 (patch)
treedcde637281ec374d339bf6cbc5012176e9b3f269 /crawl-ref/source/travel.cc
parent19bba5a5ec358bc8821bc3118add964ff303f7a9 (diff)
downloadcrawl-ref-e2179589b89a1d9786aa3111286af81878d21219.tar.gz
crawl-ref-e2179589b89a1d9786aa3111286af81878d21219.zip
Introducing shortcut for searching the current level as
requested in FR 1801705. Also adding feedback when auto-travel fails to kick in. And trying to get out of a net no longer stops travel, only being caught in one does (FR 1800821). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2263 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/travel.cc')
-rw-r--r--crawl-ref/source/travel.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 2b9af1ac94..620d16068b 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -915,8 +915,7 @@ command_type travel()
command_type result = CMD_NO_CMD;
// Abort travel/explore if you're confused or a key was pressed.
- // Or if you got caught in a net.
- if (kbhit() || you.duration[DUR_CONF] || you.attribute[ATTR_HELD])
+ if (kbhit() || you.duration[DUR_CONF])
{
stop_running();
return CMD_NO_CMD;
@@ -2240,7 +2239,13 @@ void start_translevel_travel(const travel_target &pos)
return;
if (!can_travel_to(pos.p.id))
+ {
+ if (you.level_type != LEVEL_DUNGEON)
+ mpr("Sorry, you can't auto-travel out of here.");
+ else
+ mpr("Sorry, I don't know how to get there.");
return;
+ }
if (!can_travel_interlevel())
{