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/describe.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/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 2ef983478d..1ed2e3981d 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -338,6 +338,7 @@ static const char *trap_names[] = "dart", "arrow", "spear", "axe", "teleport", "amnesia", "blade", "bolt", "net", "zot", "needle", + "shaft" }; const char *trap_name(trap_type trap) @@ -357,6 +358,9 @@ int str_to_trap(const std::string &s) return (TRAP_RANDOM); else if (s == "suitable") return (TRAP_INDEPTH); + else if (s == "nonteleport" || s == "noteleport" || s == "nontele" + || s == "notele") + return (TRAP_NONTELEPORT); for (int i = 0; i < NUM_TRAPS; ++i) { |