diff options
author | DracoOmega <draco_omega@live.com> | 2013-02-26 19:24:17 -0330 |
---|---|---|
committer | DracoOmega <draco_omega@live.com> | 2013-03-03 18:36:50 -0330 |
commit | bf0e94542fb4c2ba0df094e86d8b992edf4b5515 (patch) | |
tree | bcf8b872a542d10ed70ff76d1d5d11c9164a54e5 /crawl-ref/source/spl-other.cc | |
parent | 9cdc11531fadfbf82bed102f1a8a0a73ec8061ff (diff) | |
download | crawl-ref-bf0e94542fb4c2ba0df094e86d8b992edf4b5515.tar.gz crawl-ref-bf0e94542fb4c2ba0df094e86d8b992edf4b5515.zip |
Don't recall companions into portals and other places you can't normally take them
Diffstat (limited to 'crawl-ref/source/spl-other.cc')
-rw-r--r-- | crawl-ref/source/spl-other.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/spl-other.cc b/crawl-ref/source/spl-other.cc index 51659b7475..322cb12efc 100644 --- a/crawl-ref/source/spl-other.cc +++ b/crawl-ref/source/spl-other.cc @@ -24,6 +24,7 @@ #include "misc.h" #include "mon-place.h" #include "mon-util.h" +#include "place.h" #include "player.h" #include "player-stats.h" #include "potion.h" @@ -237,7 +238,7 @@ bool recall(int type_recalled) } // Interlevel recall - if (type_recalled > 0) + if (type_recalled > 0 && branch_allows_followers(you.where_are_you)) { if (recall_offlevel_companions()) success = true; |