diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-19 20:51:51 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-05-19 20:51:51 +0000 |
| commit | 5e05ffc14e57fff49b1f8a9700fa3623b4f1f343 (patch) | |
| tree | 2cb6bb13f8b3c7b0af877542b1325ee7e3d1bc6e /crawl-ref/source/Kills.cc | |
| parent | 3ecc52d48d75321c18bd0969f461f26e253c6537 (diff) | |
| download | crawl-ref-5e05ffc14e57fff49b1f8a9700fa3623b4f1f343.tar.gz crawl-ref-5e05ffc14e57fff49b1f8a9700fa3623b4f1f343.zip | |
monam(), moname() and ptr_monam() are gone.
The replacement is str_monam() and mons_type_name().
str_monam() should probably be folded into actor::name. I think.
Deaths from zombies, skeletons and simulacra will not handle the
name correctly; needs a further hack.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1484 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/Kills.cc')
| -rw-r--r-- | crawl-ref/source/Kills.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc index 24d929d02b..272d91be61 100644 --- a/crawl-ref/source/Kills.cc +++ b/crawl-ref/source/Kills.cc @@ -505,14 +505,12 @@ void kill_def::add_place(unsigned short place, bool force) std::string kill_def::base_name(const kill_monster_desc &md) const { - char monnamebuf[ITEMNAME_SIZE]; // Le sigh. - + std::string name; if (md.monnum == MONS_PANDEMONIUM_DEMON) - strcpy(monnamebuf, "demon lord"); + name = "demon lord"; else - moname(md.monnum, true, DESC_PLAIN, monnamebuf); + name = mons_type_name(md.monnum, DESC_PLAIN); - std::string name = monnamebuf; switch (md.modifier) { case kill_monster_desc::M_ZOMBIE: |