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/it_use3.cc | |
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/it_use3.cc')
-rw-r--r-- | crawl-ref/source/it_use3.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/it_use3.cc b/crawl-ref/source/it_use3.cc index 1c19650a76..8e835e0eca 100644 --- a/crawl-ref/source/it_use3.cc +++ b/crawl-ref/source/it_use3.cc @@ -226,7 +226,7 @@ void special_wielded() { create_monster( mgen_data(MONS_SHADOW, BEH_FRIENDLY, - 2, you.pos(), you.pet_target)); + 2, 0, you.pos(), you.pet_target)); did_god_conduct(DID_NECROMANCY, 1); } break; @@ -715,7 +715,7 @@ static bool efreet_flask(void) create_monster( mgen_data(MONS_EFREET, friendly ? BEH_FRIENDLY : BEH_HOSTILE, - 0, you.pos(), + 0, 0, you.pos(), friendly ? you.pet_target : MHITYOU, MG_FORCE_BEH)); @@ -1008,7 +1008,7 @@ static bool box_of_beasts() } if (create_monster( - mgen_data(beasty, beha, 2 + random2(4), + mgen_data(beasty, beha, 2 + random2(4), 0, you.pos(), hitting)) != -1) { success = true; |