summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/Kills.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-16 10:10:37 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-16 10:10:37 +0000
commit53ee7c6f332b5c316785d1ca5826376742fc9974 (patch)
tree3586a2be43dd91e96ad607274d1f260ac0a30cbe /crawl-ref/source/Kills.cc
parent71a111d3177425d5f4bf5298efd9ff963a4a5e62 (diff)
downloadcrawl-ref-53ee7c6f332b5c316785d1ca5826376742fc9974.tar.gz
crawl-ref-53ee7c6f332b5c316785d1ca5826376742fc9974.zip
Kill tracker now merges all pandemon kills under "demon lord".
Pandemonium demons are no longer M_UNIQUE. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1047 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/Kills.cc')
-rw-r--r--crawl-ref/source/Kills.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc
index 7bf7e86388..b146a89cd5 100644
--- a/crawl-ref/source/Kills.cc
+++ b/crawl-ref/source/Kills.cc
@@ -234,7 +234,7 @@ void Kills::merge(const Kills &k)
void Kills::record_kill(const struct monsters *mon)
{
// Handle player ghosts separately.
- if (mon->type == MONS_PLAYER_GHOST || mon->type == MONS_PANDEMONIUM_DEMON)
+ if (mon->type == MONS_PLAYER_GHOST)
{
record_ghost_kill(mon);
return ;
@@ -497,7 +497,11 @@ 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.
- moname(md.monnum, true, DESC_PLAIN, monnamebuf);
+
+ if (md.monnum == MONS_PANDEMONIUM_DEMON)
+ strcpy(monnamebuf, "demon lord");
+ else
+ moname(md.monnum, true, DESC_PLAIN, monnamebuf);
std::string name = monnamebuf;
switch (md.modifier)