diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 06:37:43 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 06:37:43 +0000 |
| commit | a59ecb47aaf7a31776f383446c9b5f2788f42d98 (patch) | |
| tree | 11dbb488dfc35980c1bccf9314c8ec65b69e1965 /crawl-ref/source/spells3.h | |
| parent | 55e422bf9dcda3c8515848e84e079da6dc9a9ad9 (diff) | |
| download | crawl-ref-a59ecb47aaf7a31776f383446c9b5f2788f42d98.tar.gz crawl-ref-a59ecb47aaf7a31776f383446c9b5f2788f42d98.zip | |
Expand the setting of spell_type in mgen_data to include all
monster-creating spells, and avoid assertion failures caused by setting
an abjuration duration of 0 and a spell_type to something other than 0.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8162 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells3.h')
| -rw-r--r-- | crawl-ref/source/spells3.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/spells3.h b/crawl-ref/source/spells3.h index 3460a91368..3ab8babacb 100644 --- a/crawl-ref/source/spells3.h +++ b/crawl-ref/source/spells3.h @@ -110,13 +110,14 @@ bool remove_curse(bool suppress_msg); bool cast_sublimation_of_blood(int pow); bool cast_call_imp(int pow, god_type god = GOD_NO_GOD); -bool summon_lesser_demon(int pow, god_type god = GOD_NO_GOD, +bool summon_lesser_demon(int pow, god_type god = GOD_NO_GOD, int spell = 0, bool quiet = false); -bool summon_common_demon(int pow, god_type god = GOD_NO_GOD, +bool summon_common_demon(int pow, god_type god = GOD_NO_GOD, int spell = 0, bool quiet = false); -bool summon_greater_demon(int pow, god_type god = GOD_NO_GOD, +bool summon_greater_demon(int pow, god_type god = GOD_NO_GOD, int spell = 0, bool quiet = false); -bool summon_demon_type(monster_type mon, int pow, god_type god = GOD_NO_GOD); +bool summon_demon_type(monster_type mon, int pow, god_type god = GOD_NO_GOD, + int spell = 0); bool cast_summon_demon(int pow, god_type god = GOD_NO_GOD); bool cast_demonic_horde(int pow, god_type god = GOD_NO_GOD); bool cast_summon_greater_demon(int pow, god_type god = GOD_NO_GOD); |