diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-08 15:34:10 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-08 15:34:10 +0000 |
| commit | 4a6ed4aa315d47f6ac7186eb217e08c6bea38a1d (patch) | |
| tree | 0310dfc6788043db7ba118fff6dccbc38a16c7c1 /crawl-ref/source/enum.h | |
| parent | 8fda0acad5c6c6bf377684d2c14de56ea2e77adf (diff) | |
| download | crawl-ref-4a6ed4aa315d47f6ac7186eb217e08c6bea38a1d.tar.gz crawl-ref-4a6ed4aa315d47f6ac7186eb217e08c6bea38a1d.zip | |
[1746247] Award experience for confused monsters killing themselves and other
monsters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1800 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 9e7de149b2..9352571060 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1707,16 +1707,19 @@ enum kill_category enum killer_type // monster_die(), thing_thrown { - KILL_YOU = 1, // 1 + KILL_NONE = 0, + KILL_YOU, // 1 KILL_MON, KILL_YOU_MISSILE, KILL_MON_MISSILE, + KILL_YOU_CONF, KILL_MISC, // 5 KILL_RESET, // abjuration, etc. KILL_DISMISSED // only on new game startup }; -#define YOU_KILL(x) ((x) == KILL_YOU || (x) == KILL_YOU_MISSILE) +#define YOU_KILL(x) ((x) == KILL_YOU || (x) == KILL_YOU_MISSILE \ + || (x) == KILL_YOU_CONF) #define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE) enum launch_retval |