diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-02 06:52:08 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-02 06:52:08 +0000 |
| commit | b153e8bfc653f4ac0e28cfe7901d3f32006b06e9 (patch) | |
| tree | e3bb56c2235eef2d93f5a3d714007b953130d5bb /crawl-ref/source/enum.h | |
| parent | 3d2b0998bdf89936687648f81c1ce68fc35080ef (diff) | |
| download | crawl-ref-b153e8bfc653f4ac0e28cfe7901d3f32006b06e9.tar.gz crawl-ref-b153e8bfc653f4ac0e28cfe7901d3f32006b06e9.zip | |
Added floor_special and floor_reserved to dngn_feature_names[], to make
the array match up with the enums.
Don't describe the weapon with which an unseen monster is attacking.
Added methods can_see() and visible_to() to the actor, player and
monster classes, which take care of calling mons_player_visible(),
player_monster_visible(), mons_monster_visible() and mons_near().
Re-arranged the first 12 dungeon_feature_type enumerations so that
similar features are contiguous (i.e., closed door and secret door are
next to each other), and added DNGN_MAXOPAQUE (one less than
DNGN_MINSEE), DNGN_MINWALL and DNGN_MAXWALL.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2293 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 61ddc607ce..ddc29fe4e9 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -840,21 +840,28 @@ enum dungeon_char_type enum dungeon_feature_type { DNGN_UNSEEN, // 0 + DNGN_CLOSED_DOOR, + DNGN_SECRET_DOOR, DNGN_ROCK_WALL, DNGN_STONE_WALL, - DNGN_CLOSED_DOOR, - DNGN_METAL_WALL, - DNGN_SECRET_DOOR, // 5 + DNGN_METAL_WALL, // 5 DNGN_GREEN_CRYSTAL_WALL, - DNGN_ORCISH_IDOL, - DNGN_WAX_WALL, // 8 - DNGN_PERMAROCK_WALL, // 9 - for undiggable walls - DNGN_CLEAR_ROCK_WALL, // 10 - Transparent - DNGN_CLEAR_STONE_WALL, // 11 - Transparent - DNGN_CLEAR_PERMAROCK_WALL, // 12 - Transparent + DNGN_WAX_WALL, + DNGN_PERMAROCK_WALL, // 8 - for undiggable walls + DNGN_CLEAR_ROCK_WALL, // 9 - Transparent + DNGN_CLEAR_STONE_WALL, // 10 - Transparent + DNGN_CLEAR_PERMAROCK_WALL, // 11 - Transparent + DNGN_ORCISH_IDOL, // 12 - Can see past + + // XXX: lowest/highest grid value which is a wall + DNGN_MINWALL = DNGN_ROCK_WALL, + DNGN_MAXWALL = DNGN_CLEAR_PERMAROCK_WALL, + + // XXX: highest grid value which is opaque + DNGN_MAXOPAQUE = DNGN_PERMAROCK_WALL, // XXX: lowest grid value which can be seen through - DNGN_MINSEE = 10, + DNGN_MINSEE = DNGN_CLEAR_ROCK_WALL, DNGN_GRANITE_STATUE = 21, // 21 DNGN_STATUE_RESERVED_1, @@ -871,9 +878,9 @@ enum dungeon_feature_type DNGN_FLOOR, // 67 DNGN_FLOOR_SPECIAL, // currently only used for colouring bazaars DNGN_FLOOR_RESERVED, - DNGN_EXIT_HELL, // 68 - DNGN_ENTER_HELL, // 69 - DNGN_OPEN_DOOR, // 70 + DNGN_EXIT_HELL, // 70 + DNGN_ENTER_HELL, // 71 + DNGN_OPEN_DOOR, // 72 DNGN_TRAP_MECHANICAL = 75, // 75 DNGN_TRAP_MAGICAL, DNGN_TRAP_III, |