From d4065da159cb407f1680de9f03596cd397ded525 Mon Sep 17 00:00:00 2001 From: dshaligram Date: Mon, 28 May 2007 11:28:11 +0000 Subject: Added new orc entries and vaults (Lemuel). Added support to the map designer for specifying the monster-type for zombies, skeletons, simulacra and spectral things. Also allow specifying the number of heads for hydras ("12-headed hydra"). Fixed lexer rule bug (IDENTIFIER). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1490 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/dungeon.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'crawl-ref/source/dungeon.cc') diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index c5538fcb7a..e3dc982dfd 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -3183,20 +3183,17 @@ static void dngn_place_item_explicit(int index, int x, int y, static bool dngn_place_monster( const vault_placement &place, - const mons_spec &monster_type_thing, + const mons_spec &mspec, int monster_level, int vx, int vy) { - if (monster_type_thing.mid != -1) + if (mspec.mid != -1) { - const int mid = monster_type_thing.mid; + const int mid = mspec.mid; const bool generate_awake = - monster_type_thing.generate_awake - || place.map.has_tag("generate_awake"); + mspec.generate_awake || place.map.has_tag("generate_awake"); - int not_used; - - const int mlev = monster_type_thing.mlevel; + const int mlev = mspec.mlevel; if (mlev) { if (mlev > 0) @@ -3217,9 +3214,11 @@ static bool dngn_place_monster( grd[vx][vy] = habitat; } + int not_used; return (place_monster( not_used, mid, monster_level, generate_awake? BEH_WANDER : BEH_SLEEP, - MHITNOT, true, vx, vy, false )); + MHITNOT, true, vx, vy, false, + PROX_ANYWHERE, mspec.monnum)); } return (false); } -- cgit v1.2.3-54-g00ecf