summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/viewmap.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-01-03 14:16:31 -0500
committerNeil Moore <neil@s-z.org>2014-01-03 14:23:03 -0500
commit771bc490630f0d0a3293ef45e3773869bc599d4c (patch)
treef7d936d19c1952bc7534fc264e7adfddaea79df7 /crawl-ref/source/viewmap.cc
parent1a0f12267a56f452457bf0e09c8bfd165b3d43fc (diff)
downloadcrawl-ref-771bc490630f0d0a3293ef45e3773869bc599d4c.tar.gz
crawl-ref-771bc490630f0d0a3293ef45e3773869bc599d4c.zip
Simplify X\, make it match feat_is_gate.
Now it finds precisely shops and those features for which feat_is_gate() is true.
Diffstat (limited to 'crawl-ref/source/viewmap.cc')
-rw-r--r--crawl-ref/source/viewmap.cc30
1 files changed, 1 insertions, 29 deletions
diff --git a/crawl-ref/source/viewmap.cc b/crawl-ref/source/viewmap.cc
index d98d720891..fbe418ef0a 100644
--- a/crawl-ref/source/viewmap.cc
+++ b/crawl-ref/source/viewmap.cc
@@ -160,35 +160,7 @@ bool is_feature(ucs_t feature, const coord_def& where)
return feat_is_altar(grid);
case '\t':
case '\\':
- switch (grid)
- {
- case DNGN_ENTER_HELL:
- case DNGN_EXIT_HELL:
- case DNGN_ENTER_LABYRINTH:
-#if TAG_MAJOR_VERSION == 34
- case DNGN_ENTER_PORTAL_VAULT:
- case DNGN_EXIT_PORTAL_VAULT:
-#endif
- case DNGN_ENTER_SHOP:
- case DNGN_ENTER_DIS:
- case DNGN_ENTER_GEHENNA:
- case DNGN_ENTER_COCYTUS:
- case DNGN_ENTER_TARTARUS:
- case DNGN_ENTER_ABYSS:
- case DNGN_EXIT_THROUGH_ABYSS:
- case DNGN_EXIT_ABYSS:
- case DNGN_ABYSSAL_STAIR:
- case DNGN_ENTER_PANDEMONIUM:
- case DNGN_EXIT_PANDEMONIUM:
- case DNGN_TRANSIT_PANDEMONIUM:
- case DNGN_ENTER_DEPTHS:
- case DNGN_RETURN_FROM_DEPTHS:
- case DNGN_ENTER_ZOT:
- case DNGN_RETURN_FROM_ZOT:
- return true;
- default:
- return false;
- }
+ return feat_is_gate(grid) || grid == DNGN_ENTER_SHOP;
case '<':
switch (grid)
{