summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/directn.cc
diff options
context:
space:
mode:
authorNicholas Feinberg <pleasingfung@gmail.com>2014-06-18 23:28:20 -0700
committerNicholas Feinberg <pleasingfung@gmail.com>2014-06-18 23:46:24 -0700
commit20f17586caff37b9dc6f1d4d32abf6f9684a25ae (patch)
treeb0913a87ce59267712eec699a8d531c6d2301b04 /crawl-ref/source/directn.cc
parent9b5e66a160e0346e3839ec27233267296d714636 (diff)
downloadcrawl-ref-20f17586caff37b9dc6f1d4d32abf6f9684a25ae.tar.gz
crawl-ref-20f17586caff37b9dc6f1d4d32abf6f9684a25ae.zip
Take the 'trap' out of web traps!
Diffstat (limited to 'crawl-ref/source/directn.cc')
-rw-r--r--crawl-ref/source/directn.cc15
1 files changed, 1 insertions, 14 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index c23261d966..79d2577aaf 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2938,20 +2938,7 @@ string thing_do_grammar(description_level_type dtype, bool add_stop,
static string _base_feature_desc(dungeon_feature_type grid, trap_type trap)
{
if (feat_is_trap(grid) && trap != NUM_TRAPS)
- {
- string basename = trap_name(trap);
- switch (trap)
- {
- case TRAP_GOLUBRIA:
- return basename + " of Golubria";
- case TRAP_PLATE:
- case TRAP_WEB:
- case TRAP_GAS:
- return basename;
- default:
- return basename + " trap";
- }
- }
+ return full_trap_name(trap);
switch (grid)
{