diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-12 11:32:15 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-12 11:32:15 +0000 |
| commit | fed7cd6012682b1638463bdc5a0303089c967846 (patch) | |
| tree | e88217f560f168f797bb895929baf3a87a83c565 /crawl-ref/source/monplace.h | |
| parent | 0dcc5cec25b63cb1649ddc501d6ea44cb0fdbc43 (diff) | |
| download | crawl-ref-fed7cd6012682b1638463bdc5a0303089c967846.tar.gz crawl-ref-fed7cd6012682b1638463bdc5a0303089c967846.zip | |
New Zot levels, courtesy Lemuel (David).
Added more control when specifying draconians in maps (any yellow draconian, green draconian knight, any nonbase red draconian, any base draconian, etc.).
Fixed crash when dragon or draconian breathes and the player is unarmed.
Replaced magic number 250 in monster creation with enum constant MONS_PROGRAM_BUG.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3253 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, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h index 0bf912b5d5..462c5ed782 100644 --- a/crawl-ref/source/monplace.h +++ b/crawl-ref/source/monplace.h @@ -112,7 +112,8 @@ enum proximity_type // proximity to player to create monster * *********************************************************************** */ int mons_place( int mon_type, beh_type behaviour, int target, bool summoned, int px, int py, int level_type = LEVEL_DUNGEON, - proximity_type proximity = PROX_ANYWHERE, int extra = 250, + proximity_type proximity = PROX_ANYWHERE, + int extra = MONS_PROGRAM_BUG, int dur = 0, bool permit_bands = false ); // last updated 12may2000 {dlb} @@ -160,10 +161,12 @@ monster_type summon_any_demon( demon_class_type demon_class ); * *********************************************************************** */ bool place_monster( int &id, int mon_type, int power, beh_type behaviour, int target, bool summoned, int px, int py, bool allow_bands, - proximity_type proximity = PROX_ANYWHERE, int extra = 250, - int dur = 0, unsigned mmask = 0 ); + proximity_type proximity = PROX_ANYWHERE, + int extra = MONS_PROGRAM_BUG, int dur = 0, + unsigned mmask = 0 ); monster_type rand_dragon( dragon_class_type type ); +bool drac_colour_incompatible(int drac, int colour); /* *********************************************************************** * called from: monplace monstuff |