summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/feature.cc
diff options
context:
space:
mode:
authorNeil Moore <neil@s-z.org>2014-07-14 13:20:15 -0400
committerNeil Moore <neil@s-z.org>2014-07-14 13:20:15 -0400
commitfb1bfb92929d8466dcc7610ea69f0026ea8fe2a9 (patch)
treef08550742136c20e601dc9c51b7cb786be4f115c /crawl-ref/source/feature.cc
parentc97130181c2d17a42e4c1d7e955c70ab0aee9702 (diff)
downloadcrawl-ref-fb1bfb92929d8466dcc7610ea69f0026ea8fe2a9.tar.gz
crawl-ref-fb1bfb92929d8466dcc7610ea69f0026ea8fe2a9.zip
Don't crash when entering Vaults (#8793)
Diffstat (limited to 'crawl-ref/source/feature.cc')
-rw-r--r--crawl-ref/source/feature.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/feature.cc b/crawl-ref/source/feature.cc
index c3344a53cb..128448eb33 100644
--- a/crawl-ref/source/feature.cc
+++ b/crawl-ref/source/feature.cc
@@ -183,7 +183,8 @@ const feature_def &get_feature_def(show_type object)
*/
bool is_valid_feature_type(dungeon_feature_type feat)
{
- return feat_index[feat] != -1;
+ return feat >= 0 && (size_t) feat < ARRAYSZ(feat_index)
+ && feat_index[feat] != -1;
}
/** Get the feature_def in feat_defs for this dungeon_feature_type.