summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/store.cc
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-04 07:18:06 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-04 07:18:06 +0000
commit02eb6893037ce2da9fd70848e2734032283b793e (patch)
tree9416ca591631b20f26c989b3a0de66fb75ccb37d /crawl-ref/source/store.cc
parent37c5451a43f1f791c77bb535cd9a1b4c32f08967 (diff)
downloadcrawl-ref-02eb6893037ce2da9fd70848e2734032283b793e.tar.gz
crawl-ref-02eb6893037ce2da9fd70848e2734032283b793e.zip
Don't assert in CrawlVector::set_max_size() if called more than once on
the same vector as long as the new max size is the same as the old one. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5471 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/store.cc')
-rw-r--r--crawl-ref/source/store.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc
index 70ff742ddb..63935079f5 100644
--- a/crawl-ref/source/store.cc
+++ b/crawl-ref/source/store.cc
@@ -1471,7 +1471,7 @@ void CrawlVector::assert_validity() const
void CrawlVector::set_max_size(vec_size _size)
{
ASSERT(_size > 0);
- ASSERT(max_size == VEC_MAX_SIZE);
+ ASSERT(max_size == VEC_MAX_SIZE || max_size == _size);
max_size = _size;
vector.reserve(max_size);