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/mapdef.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/mapdef.h')
| -rw-r--r-- | crawl-ref/source/mapdef.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index fe06561cd0..b58320684a 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -392,7 +392,7 @@ struct mons_spec { int mid; int monnum; // The zombified monster for zombies, or head - // count for hydras. + // count for hydras, or colour for draconians. int genweight, mlevel; bool fix_mons; bool generate_awake; @@ -400,7 +400,7 @@ struct mons_spec item_list items; - mons_spec(int id = RANDOM_MONSTER, int num = 250, + mons_spec(int id = RANDOM_MONSTER, int num = MONS_PROGRAM_BUG, int gw = 10, int ml = 0, bool _fixmons = false, bool awaken = false) : mid(id), monnum(num), genweight(gw), mlevel(ml), fix_mons(_fixmons), @@ -445,6 +445,7 @@ private: private: mons_spec mons_by_name(std::string name) const; + mons_spec drac_monspec(std::string name) const; void get_zombie_type(std::string s, mons_spec &spec) const; mons_spec get_hydra_spec(const std::string &name) const; mons_spec get_zombified_monster(const std::string &name, |