summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells2.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r--crawl-ref/source/spells2.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc
index e5ec060ba1..91d1a09b74 100644
--- a/crawl-ref/source/spells2.cc
+++ b/crawl-ref/source/spells2.cc
@@ -1656,11 +1656,15 @@ static bool _summon_holy_being_wrapper(int pow, god_type god,
return _summon_holy_being_wrapper(pow, god, mon, dur, friendly, quiet);
}
-bool summon_holy_warrior(int pow, god_type god, bool quiet)
+bool summon_holy_warrior(int pow, god_type god,
+ bool force_hostile, bool permanent,
+ bool quiet)
{
return _summon_holy_being_wrapper(pow, god, HOLY_BEING_WARRIOR,
- std::min(2 + (random2(pow) / 4), 6),
- true, quiet);
+ !permanent ?
+ std::min(2 + (random2(pow) / 4), 6) :
+ 0,
+ !force_hostile, quiet);
}
bool summon_holy_being_type(monster_type mon, int pow, god_type god)