summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-27 17:48:37 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-27 17:48:37 +0100
commit42d227a273a1334b60ca7574a8127d1a4b2744a1 (patch)
tree2655bcdeab4c1e157906b88ccefdda7645ee580a /crawl-ref/source/enum.h
parent5b7701dc9d19fdad4de1a64b41995d65c03b7df6 (diff)
parentdc3e12a4da48363a7cadb77f30b8e784d5f82acf (diff)
downloadcrawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.tar.gz
crawl-ref-42d227a273a1334b60ca7574a8127d1a4b2744a1.zip
Merge branch 'master' into iood
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index fe079d395f..f720abdfc7 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1203,6 +1203,7 @@ enum duration_type
DUR_SLIMIFY,
DUR_TIME_STEP,
DUR_ICEMAIL_DEPLETED, // Wait this many turns for full Icemail
+ DUR_MISLED,
NUM_DURATIONS
};
@@ -1589,8 +1590,8 @@ enum menu_type
MT_INVLIST, // List inventory
MT_DROP,
-
- MT_PICKUP
+ MT_PICKUP,
+ MT_KNOW
};
enum mon_holy_type
@@ -2060,6 +2061,8 @@ enum monster_type // (int) menv[].type
MONS_CRAZY_YIUF,
MONS_SLAVE,
MONS_GIANT_LEECH,
+ MONS_MARA,
+ MONS_MARA_FAKE,
// Testing monsters
MONS_TEST_SPAWNER,
@@ -2314,6 +2317,8 @@ enum mon_spellbook_type
MST_AIZUL,
MST_EXECUTIONER,
MST_HAROLD,
+ MST_MARA,
+ MST_MARA_FAKE,
MST_TEST_SPAWNER = 200,
NUM_MSTYPES,
@@ -2912,6 +2917,10 @@ enum spell_type
SPELL_BLINK_CLOSE,
SPELL_BLINK_RANGE,
SPELL_BLINK_AWAY,
+ SPELL_MISLEAD,
+ SPELL_FAKE_MARA_SUMMON,
+ SPELL_SUMMON_RAKSHASA,
+ SPELL_SUMMON_PLAYER_GHOST,
SPELL_IOOD,
NUM_SPELLS