diff options
author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-05 06:10:49 +0000 |
---|---|---|
committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-05 06:10:49 +0000 |
commit | 1db9c68406e0892e1ac7331dfd3b412b31741cb7 (patch) | |
tree | dabc507f32d87ba59c660f45fffa6b5b9042e6c5 /crawl-ref/source/direct.cc | |
parent | 70d59beabaddfbb2edefee1f610e16881c8ff771 (diff) | |
download | crawl-ref-1db9c68406e0892e1ac7331dfd3b412b31741cb7.tar.gz crawl-ref-1db9c68406e0892e1ac7331dfd3b412b31741cb7.zip |
Shaft traps (trap doors) [1792195] and level annotation [1769009]
added, with the shaft traps changed as per comments on SF; shafts
aren't randomly generated yet, so this doesn't change gameplay.
Changed DNGN_TRAP_III to DNGN_TRAP_NATURAL, of which trap type the
shaft traps are the only current member.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2328 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/direct.cc')
-rw-r--r-- | crawl-ref/source/direct.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index 7f4104878f..4cc6f30c57 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1491,6 +1491,8 @@ std::string raw_feature_description(dungeon_feature_type grid, return ("Zot trap"); case TRAP_NEEDLE: return ("needle trap"); + case TRAP_SHAFT: + return ("shaft trap"); default: error_message_to_player(); return ("undefined trap"); @@ -1561,8 +1563,8 @@ std::string raw_feature_description(dungeon_feature_type grid, return ("mechanical trap"); case DNGN_TRAP_MAGICAL: return ("magical trap"); - case DNGN_TRAP_III: - return ("trap"); + case DNGN_TRAP_NATURAL: + return ("natural trap"); case DNGN_ENTER_SHOP: return ("shop"); case DNGN_ENTER_LABYRINTH: @@ -1714,7 +1716,7 @@ std::string feature_description(int mx, int my, description_level_type dtype, { case DNGN_TRAP_MECHANICAL: case DNGN_TRAP_MAGICAL: - case DNGN_TRAP_III: + case DNGN_TRAP_NATURAL: return (feature_description(grid, trap_type_at_xy(mx, my), dtype, add_stop)); case DNGN_ENTER_SHOP: |