summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-19 21:01:43 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-03-19 21:01:43 +0000
commitd7b8e0e0ad2514d2a0027a3e87641f1fb9f33663 (patch)
tree3c87c38b2ff8a19c92d991fbbff3f8d9023d86e3 /crawl-ref/source/enum.h
parent0896310d744261401822f9ae37b4d0e221c1566f (diff)
downloadcrawl-ref-d7b8e0e0ad2514d2a0027a3e87641f1fb9f33663.tar.gz
crawl-ref-d7b8e0e0ad2514d2a0027a3e87641f1fb9f33663.zip
Add more holiness-related cleanups. Notably, the ANGEL-related conducts
have been renamed to HOLY-related conducts, since they apply to all holy beings, not just angels. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3732 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 78476d2940..08defe609e 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -641,14 +641,14 @@ enum conduct_type
DID_KILL_MUTATOR_OR_ROTTER, // Zin
DID_KILL_WIZARD,
DID_KILL_PRIEST,
- DID_KILL_ANGEL,
+ DID_KILL_HOLY,
DID_KILL_NEUTRAL, // unused
DID_LIVING_KILLED_BY_UNDEAD_SLAVE,
DID_LIVING_KILLED_BY_SERVANT,
DID_UNDEAD_KILLED_BY_SERVANT,
DID_DEMON_KILLED_BY_SERVANT,
DID_NATURAL_EVIL_KILLED_BY_SERVANT, // TSO
- DID_ANGEL_KILLED_BY_SERVANT,
+ DID_HOLY_KILLED_BY_SERVANT,
DID_SPELL_MEMORISE,
DID_SPELL_CASTING,
DID_SPELL_PRACTISE,