diff options
| author | Samuel Bronson <naesten@gmail.com> | 2013-04-14 19:31:47 -0400 |
|---|---|---|
| committer | Samuel Bronson <naesten@gmail.com> | 2013-04-14 19:31:47 -0400 |
| commit | d3c17637435c58112f3a46700cdd410b4a7e3359 (patch) | |
| tree | 0fd55b0cc626b335e4524369ade4bd192e5f1926 /crawl-ref/source/godcompanions.cc | |
| parent | 85ceb4fef687e2758d02f5dedecba64b9e72d6c0 (diff) | |
| download | crawl-ref-d3c17637435c58112f3a46700cdd410b4a7e3359.tar.gz crawl-ref-d3c17637435c58112f3a46700cdd410b4a7e3359.zip | |
Make Yred/Beogh's recall abilities prevent recalled dudes from running off
That is, make them follow you unless they were already attacking a
monster you can see.
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 7a1016d1a3..ab44ff93e5 100644 --- a/crawl-ref/source/godcompanions.cc +++ b/crawl-ref/source/godcompanions.cc @@ -16,6 +16,7 @@ #include "mon-util.h" #include "religion.h" #include "stuff.h" +#include "spl-other.h" #include "branch.h" map<mid_t, companion> companion_list; @@ -163,6 +164,9 @@ bool recall_offlevel_ally(mid_t mid) mons->timeout_enchantments(turns / 10); } you.moveto(old_pos); + // Do this after returning the player to the proper position + // because it uses player position + recall_orders(mons); return true; } |