diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:01:42 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:01:42 +0200 |
| commit | aff44e3dcf63bf0a5426c8d6998c8954bb44d26d (patch) | |
| tree | 1708e320052e6631f93e85301ff6d2ad75ebb1ef /crawl-ref/source/attitude-change.cc | |
| parent | 30cd027a1c26d7375360584f5df8ec9f57a09c85 (diff) | |
| parent | 1ef5305b68a6936247e5ee2a4aa7516222258490 (diff) | |
| download | crawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.tar.gz crawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.zip | |
Merge branch 'master' into lava_orcs
Diffstat (limited to 'crawl-ref/source/attitude-change.cc')
| -rw-r--r-- | crawl-ref/source/attitude-change.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/attitude-change.cc b/crawl-ref/source/attitude-change.cc index 36866e57a7..daad2a4584 100644 --- a/crawl-ref/source/attitude-change.cc +++ b/crawl-ref/source/attitude-change.cc @@ -12,6 +12,7 @@ #include "coordit.h" #include "database.h" #include "env.h" +#include "godcompanions.h" #include "goditem.h" #include "itemprop.h" #include "libutil.h" @@ -32,7 +33,6 @@ static void _jiyva_convert_slime(monster* slime); static void _fedhas_neutralise_plant(monster* plant); static void _good_god_holy_fail_attitude_change(monster* holy); - void good_god_follower_attitude_change(monster* mons) { if (you.undead_or_demonic() || crawl_state.game_is_arena()) @@ -116,7 +116,6 @@ void beogh_follower_convert(monster* mons, bool orc_hit) void slime_convert(monster* mons) { if (you.religion == GOD_JIYVA && mons_is_slime(mons) - && !mons->is_summoned() && !mons->is_shapeshifter() && !mons->neutral() && !mons->friendly() @@ -437,6 +436,7 @@ void beogh_convert_orc(monster* orc, bool emergency, orc->flags |= MF_NO_REWARD; mons_make_god_gift(orc, GOD_BEOGH); + add_companion(orc); if (orc->is_patrolling()) { |