summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/Kills.cc8
-rw-r--r--crawl-ref/source/mon-data.h2
2 files changed, 7 insertions, 3 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)
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 26c105795d..1f1b0a1409 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -4074,7 +4074,7 @@
/* random demon in pan - only one per level. stats are stored in ghost struct */
{
MONS_PANDEMONIUM_DEMON, '&', BLACK, "&",
- M_SPELLCASTER | M_SPEAKS | M_EVIL | M_UNIQUE,
+ M_SPELLCASTER | M_SPEAKS | M_EVIL,
MR_RES_POISON,
0, 14, MONS_PANDEMONIUM_DEMON, MONS_PANDEMONIUM_DEMON, MH_DEMONIC, -5,
{ {AT_HIT, AF_PLAIN, 5}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },