refactor: Verify array size, fix constness, and improve order of enum values of strings lists

Author: xezon

Core/GameEngine/Include/Common/AudioEventInfo.h

@@ -48,17 +48,19 @@ enum AudioType CPP_11(: Int)
 	AT_SoundEffect
 };
 
-extern const char *theAudioPriorityNames[];
+extern const char* const theAudioPriorityNames[];
 enum AudioPriority CPP_11(: Int)
 {
 	AP_LOWEST,
 	AP_LOW,
 	AP_NORMAL,
 	AP_HIGH,
-	AP_CRITICAL
+	AP_CRITICAL,
+
+	AP_COUNT
 };
 
-extern const char *theSoundTypeNames[];
+extern const char *const theSoundTypeNames[];
 enum SoundType CPP_11(: Int)
 {
 	ST_UI										= 0x0001,
@@ -72,7 +74,7 @@ enum SoundType CPP_11(: Int)
 	ST_EVERYONE							= 0x0100,
 };
 
-extern const char *theAudioControlNames[];
+extern const char *const theAudioControlNames[];
 enum AudioControl CPP_11(: Int)
 {
 	AC_LOOP									= 0x0001,

Core/GameEngine/Include/GameClient/ClientRandomValue.h

@@ -68,10 +68,11 @@ class GameClientRandomVariable
 	 */
 	enum DistributionType
 	{
-		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS
+		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS,
+		DISTRIBUTION_COUNT
 	};
 
-	static const char *DistributionTypeNames[];
+	static const char *const DistributionTypeNames[];
 
 	/// define the range of random values, and the distribution of values
 	void setRange( Real low, Real high, DistributionType type = UNIFORM );

Core/GameEngine/Include/GameLogic/LogicRandomValue.h

@@ -68,10 +68,11 @@ class GameLogicRandomVariable
 	 */
 	enum DistributionType
 	{
-		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS
+		CONSTANT, UNIFORM, GAUSSIAN, TRIANGULAR, LOW_BIAS, HIGH_BIAS,
+		DISTRIBUTION_COUNT
 	};
 
-	static const char *DistributionTypeNames[];
+	static const char *const DistributionTypeNames[];
 
 	/// define the range of random values, and the distribution of values
 	void setRange( Real low, Real high, DistributionType type = UNIFORM );

Core/GameEngine/Source/Common/INI/INIAudioEventInfo.cpp

@@ -179,7 +179,7 @@ static void parsePitchShift( INI* ini, void *instance, void *store, const void*
 
 // STATIC DEFINIITIONS ////////////////////////////////////////////////////////////////////////////
 
-const char *theAudioPriorityNames[] =
+const char *const theAudioPriorityNames[] =
 {
 	"LOWEST",
 	"LOW",
@@ -188,8 +188,9 @@ const char *theAudioPriorityNames[] =
 	"CRITICAL",
 	NULL
 };
+static_assert(ARRAY_SIZE(theAudioPriorityNames) == AP_COUNT + 1, "Incorrect array size");
 
-const char *theSoundTypeNames[] =
+const char *const theSoundTypeNames[] =
 {
 	"UI",
 	"WORLD",
@@ -203,7 +204,7 @@ const char *theSoundTypeNames[] =
 	NULL
 };
 
-const char *theAudioControlNames[] =
+const char *const theAudioControlNames[] =
 {
 	"LOOP",
 	"RANDOM",

Core/GameEngine/Source/Common/RandomValue.cpp

@@ -350,10 +350,11 @@ DEBUG_LOG(( "%d: GetGameAudioRandomValueReal = %f, %s line %d",
 // GameClientRandomVariable
 //
 
-/*static*/ const char *GameClientRandomVariable::DistributionTypeNames[] =
+const char *const GameClientRandomVariable::DistributionTypeNames[] =
 {
 	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS", NULL
 };
+static_assert(ARRAY_SIZE(GameClientRandomVariable::DistributionTypeNames) == GameClientRandomVariable::DISTRIBUTION_COUNT + 1, "Incorrect array size");
 
 /**
 	define the range of random values, and the distribution of values
@@ -395,10 +396,11 @@ Real GameClientRandomVariable::getValue( void ) const
 // GameLogicRandomVariable
 //
 
-/*static*/ const char *GameLogicRandomVariable::DistributionTypeNames[] =
+const char *const GameLogicRandomVariable::DistributionTypeNames[] =
 {
 	"CONSTANT", "UNIFORM", "GAUSSIAN", "TRIANGULAR", "LOW_BIAS", "HIGH_BIAS", NULL
 };
+static_assert(ARRAY_SIZE(GameLogicRandomVariable::DistributionTypeNames) == GameLogicRandomVariable::DISTRIBUTION_COUNT + 1, "Incorrect array size");
 
 /**
 	define the range of random values, and the distribution of values

Core/Libraries/Source/WWVegas/WW3D2/rendobj.h

@@ -85,20 +85,6 @@ template<class T> class DynamicVectorClass;
 // "unreferenced formal parameter"
 #pragma warning(disable : 4100)
 
-#ifdef DEFINE_W3DANIMMODE_NAMES
-static const char* TheAnimModeNames[] =
-{
-	"MANUAL",
-	"LOOP",
-	"ONCE",
-	"LOOP_PINGPONG",
-	"LOOP_BACKWARDS",
-	"ONCE_BACKWARDS",
-	NULL
-};
-#endif
-
-
 //////////////////////////////////////////////////////////////////////////////////
 // RenderObjClass
 // This is the interface for all objects that get rendered by WW3D.
@@ -336,6 +322,8 @@ class RenderObjClass : public RefCountClass , public PersistClass, public MultiL
 		ANIM_MODE_LOOP_PINGPONG,
 		ANIM_MODE_LOOP_BACKWARDS,	//make sure only backwards playing animations after this one
 		ANIM_MODE_ONCE_BACKWARDS,
+
+		ANIM_MODE_COUNT
 	};
 
 	virtual void					Set_Animation( void )														{ }
@@ -653,6 +641,19 @@ WWINLINE bool RenderObjClass::Is_Transform_Identity_No_Validity_Check() const
 }
 
 
+#ifdef DEFINE_W3DANIMMODE_NAMES
+static const char* const TheAnimModeNames[] =
+{
+	"MANUAL",
+	"LOOP",
+	"ONCE",
+	"LOOP_PINGPONG",
+	"LOOP_BACKWARDS",
+	"ONCE_BACKWARDS",
+	NULL
+};
+static_assert(ARRAY_SIZE(TheAnimModeNames) == RenderObjClass::ANIM_MODE_COUNT + 1, "Incorrect array size");
+#endif
 
 
 #endif

Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.cpp

@@ -95,7 +95,7 @@ static unsigned FreeCount;
 ** Name for each memory category.  I'm padding the array with some "undefined" strings in case
 ** someone forgets to set the name when adding a new category.
 */
-static const char * _MemoryCategoryNames[] =
+static const char *const _MemoryCategoryNames[] =
 {
 	"UNKNOWN",
 	"Geometry",

Core/Libraries/Source/WWVegas/WWLib/Except.cpp

@@ -138,7 +138,7 @@ static StackWalkType								_StackWalk = NULL;
 static SymFunctionTableAccessType	_SymFunctionTableAccess = NULL;
 static SymGetModuleBaseType				_SymGetModuleBase = NULL;
 
-static char const *ImagehelpFunctionNames[] =
+static char const *const ImagehelpFunctionNames[] =
 {
 	"SymCleanup",
 	"SymGetSymFromAddr",

Core/Libraries/Source/WWVegas/WWLib/WWCommon.h

@@ -20,6 +20,13 @@
 
 #include "stringex.h"
 
+
+// This macro serves as a general way to determine the number of elements within an array.
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) int(sizeof(x)/sizeof(x[0]))
+#endif
+
+
 #if defined(_MSC_VER) && _MSC_VER < 1300
 typedef unsigned MemValueType;
 #else

Core/Libraries/Source/WWVegas/WWLib/always.h

@@ -254,13 +254,6 @@ template <class T> T max(T a,T b)
 	#define	NULL		0
 #endif
 
-/**********************************************************************
-**	This macro serves as a general way to determine the number of elements
-**	within an array.
-*/
-#ifndef ARRAY_SIZE
-#define	ARRAY_SIZE(x)		int(sizeof(x)/sizeof(x[0]))
-#endif
 
 #ifndef size_of
 #define size_of(typ,id) sizeof(((typ*)0)->id)