summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/godcompanions.cc
diff options
context:
space:
mode:
authorDracoOmega <draco_omega@live.com>2013-03-08 21:29:20 -0330
committerDracoOmega <draco_omega@live.com>2013-03-09 14:38:04 -0330
commit885b5f1ec66695cd77cf3a71cecef68178d365a6 (patch)
tree0cb760369d23165bba94c7a6dbe0ef798c8b3df9 /crawl-ref/source/godcompanions.cc
parente24ed8bb71cfc1525ba451563bb4a3e57595797e (diff)
downloadcrawl-ref-885b5f1ec66695cd77cf3a71cecef68178d365a6.tar.gz
crawl-ref-885b5f1ec66695cd77cf3a71cecef68178d365a6.zip
Fix another method of cloning Yred/Beogh companions
Diffstat (limited to 'crawl-ref/source/godcompanions.cc')
-rw-r--r--crawl-ref/source/godcompanions.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/godcompanions.cc b/crawl-ref/source/godcompanions.cc
index 9874a1eb21..2cd21b7159 100644
--- a/crawl-ref/source/godcompanions.cc
+++ b/crawl-ref/source/godcompanions.cc
@@ -103,7 +103,7 @@ void populate_offlevel_recall_list(vector<pair<mid_t, int> > &recall_list)
bool recall_offlevel_ally(mid_t mid)
{
- if (!companion_is_elsewhere(mid))
+ if (!companion_is_elsewhere(mid, true))
return false;
companion* comp = &companion_list[mid];
@@ -152,12 +152,12 @@ bool recall_offlevel_ally(mid_t mid)
return false;
}
-bool companion_is_elsewhere(mid_t mid)
+bool companion_is_elsewhere(mid_t mid, bool must_exist)
{
if (companion_list.find(mid) != companion_list.end())
return (companion_list[mid].level != level_id::current());
- return false;
+ return (!must_exist);
}
void wizard_list_companions()