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/spells2.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/spells2.h')
| -rw-r--r-- | crawl-ref/source/spells2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spells2.h b/crawl-ref/source/spells2.h index 1ed6cec231..f3f03486c4 100644 --- a/crawl-ref/source/spells2.h +++ b/crawl-ref/source/spells2.h @@ -61,13 +61,13 @@ bool cast_summon_elemental(int pow, god_type god = GOD_NO_GOD, bool cast_summon_ice_beast(int pow, god_type god = GOD_NO_GOD); bool cast_summon_ugly_thing(int pow, god_type god = GOD_NO_GOD); bool cast_summon_dragon(int pow, god_type god = GOD_NO_GOD); -bool summon_berserker(int pow, god_type god = GOD_NO_GOD, +bool summon_berserker(int pow, god_type god = GOD_NO_GOD, int spell = 0, bool force_hostile = false); -bool summon_holy_warrior(int pow, god_type god = GOD_NO_GOD, +bool summon_holy_warrior(int pow, god_type god = GOD_NO_GOD, int spell = 0, bool force_hostile = false, bool permanent = false, bool quiet = false); bool summon_holy_being_type(monster_type mon, int pow, - god_type god = GOD_NO_GOD); + god_type god = GOD_NO_GOD, int spell = 0); bool cast_tukimas_dance(int pow, god_type god = GOD_NO_GOD, bool force_hostile = false); bool cast_conjure_ball_lightning(int pow, god_type god = GOD_NO_GOD); |