diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 18:56:45 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-26 18:56:45 +0000 |
| commit | 05f88f06a2e406d12ce5acecf52764406e31cb2c (patch) | |
| tree | c8a12ff02256964dd8773f9ad6d90805ffde52e5 /crawl-ref/source/monplace.h | |
| parent | b5789ec262b15387d1a8d210dee9c79631e85ed6 (diff) | |
| download | crawl-ref-05f88f06a2e406d12ce5acecf52764406e31cb2c.tar.gz crawl-ref-05f88f06a2e406d12ce5acecf52764406e31cb2c.zip | |
Fix a bug in monster summoning that was causing crashes, for example
when attempting to cast Shadow Creatures in a bazaar (which is bound to
fail, anyway). I guess it would have also caused crashes anywhere else
where the level was devoid of monsters and creating one failed - for
whatever reason. I don't actually know how likely that combination is.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6151 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monplace.h')
| -rw-r--r-- | crawl-ref/source/monplace.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h index bbba9f3c3f..ab03196433 100644 --- a/crawl-ref/source/monplace.h +++ b/crawl-ref/source/monplace.h @@ -21,7 +21,7 @@ enum band_type { BAND_NO_BAND = 0, - BAND_KOBOLDS = 1, + BAND_KOBOLDS, BAND_ORCS, BAND_ORC_WARRIOR, BAND_ORC_KNIGHT, @@ -35,6 +35,7 @@ enum band_type BAND_HELL_KNIGHTS, BAND_ORC_HIGH_PRIEST, BAND_GNOLLS, // 14 + // 15 BAND_BUMBLEBEES = 16, BAND_CENTAURS, BAND_YAKTAURS, @@ -63,9 +64,9 @@ enum band_type BAND_GIANT_MOSQUITOES, BAND_BOGGARTS, BAND_BLINK_FROGS, - BAND_SKELETAL_WARRIORS, // 44 + BAND_SKELETAL_WARRIORS, BAND_DRACONIAN, // 45 - BAND_PANDEMONIUM_DEMON, + BAND_PANDEMONIUM_DEMON, // 46 NUM_BANDS // always last }; @@ -234,7 +235,7 @@ struct mgen_data * used for summons and other monsters that want to appear near a given * position like a summon. * *********************************************************************** */ -int create_monster( mgen_data mg ); +int create_monster( mgen_data mg, bool fail_msg = true ); /* *********************************************************************** * Primary function to create monsters. See mgen_data for details on monster |