summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/defines.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-11-01 18:24:42 +0100
committerAdam Borowski <kilobyte@angband.pl>2013-11-01 18:24:42 +0100
commitbc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417 (patch)
tree2d4f6b41f802401ba3f76e9f71e03ad25efd71e1 /crawl-ref/source/defines.h
parent3bf288448a8a98d7f1b2db89711c778cf335b18c (diff)
parentd201e361eac08bd032e84322fd2baef71ea63227 (diff)
downloadcrawl-ref-bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417.tar.gz
crawl-ref-bc5fafc588da8c2a0bb7b5aa2aa915f4c6b0e417.zip
Merge branch 'master' into dwants
Diffstat (limited to 'crawl-ref/source/defines.h')
-rw-r--r--crawl-ref/source/defines.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/defines.h b/crawl-ref/source/defines.h
index 21a863e5cf..53934da415 100644
--- a/crawl-ref/source/defines.h
+++ b/crawl-ref/source/defines.h
@@ -57,6 +57,7 @@ enum extra_monster_index_type
{
MAX_MONSTERS = 700, // max size of monster array {dlb}
ANON_FRIENDLY_MONSTER = MAX_MONSTERS,// unknown/dead ally, for actor blaming
+ YOU_FAULTLESS, // full xp but no penalty (reflection)
NON_MONSTER = NON_ENTITY, // no monster
MHITNOT = NON_MONSTER,
@@ -225,6 +226,7 @@ const int ANTITRAIN_PENALTY = 2;
#define TORNADO_RADIUS 6
#define NUMBER_OF_RUNES_NEEDED 3
+#define RUNE_LOCK_DEPTH 14
// Size of unique_items in player class
#define MAX_UNRANDARTS 100