diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-02 17:46:13 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-01-02 17:46:13 +0000 |
| commit | 1b118f124d13d86d7590ead3709fd56a16fa7804 (patch) | |
| tree | b43cb41adff0fa7790e70facafe103de4eb77945 /crawl-ref/source/acr.cc | |
| parent | 1826273cc56b745d81621bb8b44ba0efd0d95c15 (diff) | |
| download | crawl-ref-1b118f124d13d86d7590ead3709fd56a16fa7804.tar.gz crawl-ref-1b118f124d13d86d7590ead3709fd56a16fa7804.zip | |
Moved i_feel_safe checks to the travel start functions themselves.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@770 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index ec6f786083..fa73929390 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1243,11 +1243,9 @@ void process_command( command_type cmd ) { mpr("Sorry, you can't auto-travel out of here."); break; } - if (i_feel_safe(true)) - { - start_translevel_travel(); + start_translevel_travel(); + if (you.running) mesclr(); - } break; case CMD_EXPLORE: @@ -1257,8 +1255,7 @@ void process_command( command_type cmd ) { break; } // Start exploring - if (i_feel_safe(true)) - start_explore(Options.explore_greedy); + start_explore(Options.explore_greedy); break; case CMD_DISPLAY_MAP: @@ -1272,7 +1269,7 @@ void process_command( command_type cmd ) { plox[0] = 0; show_map(plox, true); redraw_screen(); - if (plox[0] > 0 && i_feel_safe(true)) + if (plox[0] > 0) start_travel(plox[0], plox[1]); break; |