summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/terrain.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc
index 88fa5905b2..24194ae463 100644
--- a/crawl-ref/source/terrain.cc
+++ b/crawl-ref/source/terrain.cc
@@ -323,8 +323,9 @@ void get_door_description(int door_size, const char** adjective, const char** no
"huge " , "gate",
};
- const unsigned int idx = std::min(static_cast<unsigned int>(door_size*2),
- ARRAYSZ(descriptions) - 2);
+ int max_idx = static_cast<int>(ARRAYSZ(descriptions) - 2);
+ const unsigned int idx = std::min(door_size*2, max_idx);
+
*adjective = descriptions[idx];
*noun = descriptions[idx+1];
}