From f22bd308c51e4f4425210e98d6623a6ed2be344a Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Fri, 30 May 2008 10:44:02 +0000 Subject: Just for kicks, reuse monster property mname to name zombies/skeletons raised from unique monster's corpses. The unique number is stored in orig_monnum, so this doesn't apply to orcish followers. I thought it would be cool to have Sigmund the human zombie in your ranks, or to fight againt Blork the orc skeleton. The corpses are currently not differentiated (just "human corpse", "orc skeleton"), just the resulting undead. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5343 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/mon-util.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/mon-util.cc') diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index dea0163bad..1d1fed8710 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1636,7 +1636,7 @@ static std::string _str_monam(const monsters& mon, description_level_type desc, // If the monster has an explicit name, return that, handling it like // a unique's name. - if (!mon.mname.empty()) + if (desc != DESC_BASENAME && !mon.mname.empty()) return mon.mname; std::string result; @@ -1773,10 +1773,10 @@ std::string mons_type_name(int type, description_level_type desc ) result += get_monster_data(type)->name; // Vowel fix: Change 'a orc' to 'an orc' - if ( result.length() >= 3 - && (result[0] == 'a' || result[0] == 'A') - && result[1] == ' ' - && is_vowel(result[2]) ) + if (result.length() >= 3 + && (result[0] == 'a' || result[0] == 'A') + && result[1] == ' ' + && is_vowel(result[2]) ) { result.insert(1, "n"); } -- cgit v1.2.3-54-g00ecf