diff options
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/religion.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 6a6759e67a..7f86832094 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -5248,7 +5248,7 @@ static bool _yred_undead_slaves_on_level_abandon_you() static_cast<int>(you.where_are_you)); #endif - yred_make_enslaved_soul(monster, true, true, false); + yred_make_enslaved_soul(monster, true, true, true); success = true; } @@ -5342,7 +5342,7 @@ static bool _yred_slaves_abandon_you() if (_is_yred_enslaved_body_and_soul(monster)) - yred_make_enslaved_soul(monster, true, true, false); + yred_make_enslaved_soul(monster, true, true, true); else { monster->attitude = ATT_HOSTILE; @@ -5603,9 +5603,9 @@ static bool _tso_holy_revenge() } void yred_make_enslaved_soul(monsters *mon, bool force_hostile, - bool quiet, bool allow_fail) + bool quiet, bool unlimited) { - if (allow_fail) + if (!unlimited) _yred_souls_disappear(); const int type = mon->type; diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index d9767c282f..e29785b1e0 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -101,7 +101,7 @@ bool yred_injury_mirror(bool actual = true); bool beogh_water_walk(); void good_god_holy_attitude_change(monsters *holy); void yred_make_enslaved_soul(monsters *mon, bool force_hostile = false, - bool quiet = false, bool allow_fail = true); + bool quiet = false, bool unlimited = false); void beogh_convert_orc(monsters *orc, bool emergency, bool converted_by_follower = false); bool is_holy_item(const item_def& item); |