Check ranges in data_index directly.

Also, have operator[] take a key rather than a raw integer.

1 files changed, 4 insertions, 2 deletions

diff --git a/crawl-ref/source/data-index.h b/crawl-ref/source/data-index.h
index fc84cb4d9c..5775043b11 100644
--- a/crawl-ref/source/data-index.h
+++ b/crawl-ref/source/data-index.h
@@ -13,14 +13,16 @@ public:
     data_index(const TVal* _pop) : pop(_pop), index_created(false)
     { }
 
-    const TVal* operator[](int i)
+    const TVal* operator[](TKey key)
     {
+        ASSERT_RANGE(key, 0, NMax);
         check_index();
-        return (&pop[index[i]]);
+        return (&pop[index[key]]);
     }
 
     bool contains(TKey key)
     {
+        ASSERT_RANGE(key, 0, NMax);
         check_index();
         return (index[key] >= 0);
     }