diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-30 20:46:52 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-30 20:46:52 +0000 |
| commit | c1bb85e6d49158b25566faed66fde382f6a2332f (patch) | |
| tree | ed69a836a6e016f7a28e9154127bc9e4fb3a0773 /crawl-ref/source/spells2.cc | |
| parent | 451fb7b49934ec01be4e336d5f42eded24e351c1 (diff) | |
| download | crawl-ref-c1bb85e6d49158b25566faed66fde382f6a2332f.tar.gz crawl-ref-c1bb85e6d49158b25566faed66fde382f6a2332f.zip | |
Add yet more holy being-related cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7317 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells2.cc')
| -rw-r--r-- | crawl-ref/source/spells2.cc | 10 |
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) |