diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 12:27:44 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-01 12:27:44 +0000 |
| commit | 033b2f5904e3a87e5ce2605b2779be860bf46682 (patch) | |
| tree | 538907b1b7b6475845ec008d953c188047851ad8 /crawl-ref/source/debug.cc | |
| parent | cd46d3d8df2dfddda422fa80cfc47240de365b13 (diff) | |
| download | crawl-ref-033b2f5904e3a87e5ce2605b2779be860bf46682.tar.gz crawl-ref-033b2f5904e3a87e5ce2605b2779be860bf46682.zip | |
Fix 1937489: Remove map markers overwritten by lakes or rivers, as was
already done for vaults.
Modify monster speech to make the beast only use some selected shouts
(i.e. not "You hear an irritating whine") and NEVER do the demon taunts
since it cannot speak.
Demon lords can use almost the whole array of speaking verbs except for
"buzz" and "whine".
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5400 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/debug.cc')
| -rw-r--r-- | crawl-ref/source/debug.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index d38b849866..68dad70bbc 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -438,7 +438,11 @@ void create_spec_monster_name(int x, int y) mons_spec mspec = mlist.get_monster(0); if (!force_place && mspec.mid != -1) { - coord_def place = find_newmons_square(mspec.mid, coord_def(x, y)); + int type = mspec.mid; + if (mons_class_is_zombified(mspec.mid)) + type = mspec.monbase; + + coord_def place = find_newmons_square(type, coord_def(x, y)); if (in_bounds(place)) { x = place.x; @@ -453,11 +457,11 @@ void create_spec_monster_name(int x, int y) if (!dgn_place_monster(mspec, you.your_level, x, y, false)) { - mpr("Unable to place monster"); + mpr("Unable to place monster."); return; } - // Need to set a name for the player ghost + // Need to set a name for the player ghost. if (mspec.mid == MONS_PLAYER_GHOST) { unsigned short mid = mgrd[x][y]; @@ -485,7 +489,7 @@ void create_spec_monster_name(int x, int y) ghost.name = "John Doe"; char input_str[80]; - mpr( "Make player ghost which species? (case-sensitive) ", MSGCH_PROMPT ); + mpr("Make player ghost which species? (case-sensitive) ", MSGCH_PROMPT); get_input_line( input_str, sizeof( input_str ) ); int sp_id = get_species_by_abbrev(input_str); |