summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-28 19:03:25 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-02-28 19:03:25 +0000
commit7dee23de061e78fc7a20ed8ef93d31716d82f8de (patch)
treeb6f55a90166d5e05c0f645e25ef6a347f345e071 /crawl-ref/source/enum.h
parent2b335fe17e827aa4b3d756c5f5340767d002572e (diff)
downloadcrawl-ref-7dee23de061e78fc7a20ed8ef93d31716d82f8de.tar.gz
crawl-ref-7dee23de061e78fc7a20ed8ef93d31716d82f8de.zip
Add conducts for undead slaves' killing undead and demons. Currently,
the only difference between these and the conducts for servants' killing undead and demons are the messages ("slaves' kills" vs. "collateral kills"). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9288 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index b1318981aa..9f24460b02 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -706,7 +706,9 @@ enum conduct_type
DID_KILL_HOLY,
DID_LIVING_KILLED_BY_UNDEAD_SLAVE,
DID_LIVING_KILLED_BY_SERVANT,
+ DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE,
DID_UNDEAD_KILLED_BY_SERVANT,
+ DID_DEMON_KILLED_BY_UNDEAD_SLAVE,
DID_DEMON_KILLED_BY_SERVANT,
DID_NATURAL_EVIL_KILLED_BY_SERVANT, // TSO
DID_HOLY_KILLED_BY_UNDEAD_SLAVE,