summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-29 19:42:25 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-29 19:42:25 +0000
commitce8b57822e05def892bca46e7e724bc6625d73ba (patch)
tree033beef59721cd41a6900e874d10ea78d8a4fb1e /crawl-ref/source/enum.h
parent996361d167065bc29bef5da248e3d18bd0d9cbab (diff)
downloadcrawl-ref-ce8b57822e05def892bca46e7e724bc6625d73ba.tar.gz
crawl-ref-ce8b57822e05def892bca46e7e724bc6625d73ba.zip
* Merfolk may wear heavy armour while swimming, though their armour
penalty is doubled in deep water. * Change "zombified ally" -> "mindless thrall" (and only count friendly monsters). * Call trackers_init_new_level() earlier, in load(), so that TileNewLevel() can use the correct travel information when drawing exclusions on the minimap. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9566 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 478b36d1ad..b20e911d3f 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1533,30 +1533,30 @@ enum map_marker_type
enum map_feature
{
- MF_UNSEEN,
+ MF_UNSEEN, // 0
MF_FLOOR,
MF_WALL,
MF_MAP_FLOOR,
MF_MAP_WALL,
- MF_DOOR,
+ MF_DOOR, // 5
MF_ITEM,
MF_MONS_HOSTILE,
MF_MONS_FRIENDLY,
MF_MONS_NEUTRAL,
- MF_MONS_NO_EXP,
+ MF_MONS_NO_EXP, // 10
MF_STAIR_UP,
MF_STAIR_DOWN,
MF_STAIR_BRANCH,
MF_FEATURE,
- MF_WATER,
+ MF_WATER, // 15
MF_LAVA,
MF_TRAP,
MF_EXCL_ROOT,
MF_EXCL,
- MF_PLAYER,
+ MF_PLAYER, // 20
MF_MAX,
- MF_SKIP
+ MF_SKIP // 22
};
enum menu_type