diff options
| author | DracoOmega <draco_omega@live.com> | 2013-02-26 19:03:41 -0330 |
|---|---|---|
| committer | DracoOmega <draco_omega@live.com> | 2013-03-03 18:36:49 -0330 |
| commit | 9cdc11531fadfbf82bed102f1a8a0a73ec8061ff (patch) | |
| tree | d0ef9bc8ff8822f806a66849656d9a67458c0e9d /crawl-ref/source/godcompanions.cc | |
| parent | 5366e40bb4f959cf39edc21afbcf167bddba3009 (diff) | |
| download | crawl-ref-9cdc11531fadfbf82bed102f1a8a0a73ec8061ff.tar.gz crawl-ref-9cdc11531fadfbf82bed102f1a8a0a73ec8061ff.zip | |
Continue tracking banished companions, but don't recall them out of the Abyss
Diffstat (limited to 'crawl-ref/source/godcompanions.cc')
| -rw-r--r-- | crawl-ref/source/godcompanions.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/godcompanions.cc b/crawl-ref/source/godcompanions.cc index 0edbd3ee90..a26c0cb5a0 100644 --- a/crawl-ref/source/godcompanions.cc +++ b/crawl-ref/source/godcompanions.cc @@ -91,6 +91,10 @@ bool recall_offlevel_companions() companion* comp = &i->second; if (comp->level != level_id::current()) { + // Recall can't pull monsters out of the Abyss + if (comp->level.branch == BRANCH_ABYSS) + continue; + if (comp->mons.place(true)) { monster* mons = monster_by_mid(mid); |