Fix [ 1902141 ] Documentation wrong

- changed number comments on a few enums
- added a few COMPILE_CHECKs so they'll get caught
Other:
- Fix COMPILE_CHECK macro so it doesn't cause a warning in gcc.
- Replace ASSERT(...) with COMPILE_CHECK(...) where possible.



git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3501 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 4 deletions

diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc
index 74b30e88d2..2696f6e5b9 100644
--- a/crawl-ref/source/itemname.cc
+++ b/crawl-ref/source/itemname.cc
@@ -1294,16 +1294,14 @@ std::string item_def::name_aux( description_level_type desc,
                 "smoky ", "glowing ", "sedimented ", "metallic ", "murky ",
                 "gluggy ", "oily ", "slimy ", "emulsified "
             };
-            ASSERT( sizeof(potion_qualifiers) / sizeof(*potion_qualifiers)
-                        == PDQ_NQUALS );
+            COMPILE_CHECK( ARRAYSIZE(potion_qualifiers) == PDQ_NQUALS, c1 );
 
             static const char *potion_colours[] = {
                 "clear", "blue", "black", "silvery", "cyan", "purple",
                 "orange", "inky", "red", "yellow", "green", "brown", "pink",
                 "white"
             };
-            ASSERT( sizeof(potion_colours) / sizeof(*potion_colours)
-                        == PDC_NCOLOURS );
+            COMPILE_CHECK( ARRAYSIZE(potion_colours) == PDC_NCOLOURS, c1 );
 
             const char *qualifier = 
                 (pqual < 0 || pqual >= PDQ_NQUALS)? "bug-filled "