chore: Add static asserts to verify the size of arrays

Core/GameEngine/Include/Common/AudioEventInfo.h

@@ -70,6 +70,8 @@ enum SoundType CPP_11(: Int)
 	ST_ALLIES								= 0x0040,
 	ST_ENEMIES							= 0x0080,
 	ST_EVERYONE							= 0x0100,
+
+	SOUND_TYPE_END // keep after the last named flag
 };
 
 extern const char *const theAudioControlNames[];
@@ -80,6 +82,8 @@ enum AudioControl CPP_11(: Int)
 	AC_ALL									= 0x0004,
 	AC_POSTDELAY						= 0x0008,
 	AC_INTERRUPT						= 0x0010,
+
+	AUDIO_CONTROL_END // keep after the last named flag
 };
 
 class DynamicAudioEventInfo;

Core/GameEngine/Include/Common/Debug.h

@@ -154,7 +154,7 @@ class AsciiString;
 		DEBUG_LEVEL_NET = 0,           // in-game network
 		DEBUG_LEVEL_MAX
 	};
-	extern const char *TheDebugLevels[DEBUG_LEVEL_MAX];
+	extern const char *TheDebugLevels[];
 
 	#define DEBUG_LOG(m)						do { { DebugLog m ; } } while (0) // Log message with trailing new line character (LF)
 	#define DEBUG_LOG_RAW(m)				do { { DebugLogRaw m ; } } while (0) // Log message without trailing new line character (LF)

Core/GameEngine/Include/Common/Dict.h

@@ -75,7 +75,9 @@ class Dict
 		DICT_INT,
 		DICT_REAL,
 		DICT_ASCIISTRING,
-		DICT_UNICODESTRING
+		DICT_UNICODESTRING,
+
+		DICT_TYPE_COUNT
 	};
 
 	/**

Core/GameEngine/Include/GameClient/ControlBar.h

@@ -99,6 +99,8 @@ enum CommandOption CPP_11(: Int)
 	USES_MINE_CLEARING_WEAPONSET= 0x00200000,	// uses the special mine-clearing weaponset, even if not current
 	CAN_USE_WAYPOINTS						= 0x00400000, // button has option to use a waypoint path
 	MUST_BE_STOPPED							= 0x00800000, // Unit must be stopped in order to be able to use button.
+
+	COMMAND_OPTION_END // keep after the last named flag
 };
 
 #ifdef DEFINE_COMMAND_OPTION_NAMES
@@ -135,6 +137,7 @@ static const char *const TheCommandOptionNames[] =
 
 	nullptr
 };
+static_assert(1 << (ARRAY_SIZE(TheCommandOptionNames) - 2) == COMMAND_OPTION_END - 1, "Incorrect array size");
 #endif  // end DEFINE_COMMAND_OPTION_NAMES
 
 // convenient bit masks to group some command options together

Core/GameEngine/Include/GameClient/Gadget.h

@@ -105,6 +105,7 @@ enum
 	GWS_TAB_PANE					= 0x00004000,
 	GWS_COMBO_BOX					= 0x00008000,
 
+	GWS_END, // keep after the last named flag
 
 	GWS_ALL_SLIDER = GWS_VERT_SLIDER | GWS_HORZ_SLIDER,  // for convenience
 

Core/GameEngine/Include/GameClient/GameWindow.h

@@ -153,7 +153,6 @@ enum WinInputReturnCode CPP_11(: Int)
 enum
 {
 
-	// when you edit this, remember to edit WindowStatusNames[]
 	WIN_STATUS_NONE								= 0x00000000,		// No status bits set at all
 	WIN_STATUS_ACTIVE							= 0x00000001,		// At the top of the window list
 	WIN_STATUS_TOGGLE							= 0x00000002,		// If set, click to toggle
@@ -181,9 +180,11 @@ enum
 	WIN_STATUS_FLASHING						= 0x00800000,   // Used for buttons that do cameo flashes.
 	WIN_STATUS_ALWAYS_COLOR				= 0x01000000,		// Never render these buttons using greyscale renderer when button disabled.
 	WIN_STATUS_ON_MOUSE_DOWN			= 0x02000000,		// Pushbutton triggers on mouse down.
-	WIN_STATUS_SHORTCUT_BUTTON		= 0x04000000,   // Oh god... this is a total hack for shortcut buttons to handle rendering text top left corner...
-	// when you edit this, remember to edit WindowStatusNames[]
 
+	WIN_STATUS_END, // keep after the last named flag
+
+	// Code only flags without a name in WindowStatusNames[]
+	WIN_STATUS_SHORTCUT_BUTTON		= 0x04000000,   // Oh god... this is a total hack for shortcut buttons to handle rendering text top left corner...
 };
 
 

Core/GameEngine/Include/GameClient/GlobalLanguage.h

@@ -74,6 +74,7 @@ class GlobalLanguage : public SubsystemInterface
 		ResolutionFontSizeMethod_Strict, // Uses a strict scaling method. Width and height are strictly bounded on upscales. Works well for accurate UI layouts and with large resolutions.
 		ResolutionFontSizeMethod_Balanced, // Uses a balanced scaling method. Width and height are evenly weighted for upscales. Works well for the original Game UI and with large resolutions.
 
+		ResolutionFontSizeMethod_Count,
 		ResolutionFontSizeMethod_Default = ResolutionFontSizeMethod_ClassicNoCeiling,
 	};
 

Core/GameEngine/Include/GameClient/Image.h

@@ -47,6 +47,7 @@ typedef enum
 	IMAGE_STATUS_ROTATED_90_CLOCKWISE	= 0x00000001,  // image should be treated as rotated
 	IMAGE_STATUS_RAW_TEXTURE					= 0x00000002,  // image struct contains raw texture data
 
+	IMAGE_STATUS_END // keep after the last named flag
 } ImageStatus;
 #ifdef DEFINE_IMAGE_STATUS_NAMES
 static const char *const imageStatusNames[] =
@@ -55,6 +56,7 @@ static const char *const imageStatusNames[] =
 	"RAW_TEXTURE",
 	nullptr
 };
+static_assert(1 << (ARRAY_SIZE(imageStatusNames) - 2) == IMAGE_STATUS_END - 1, "Incorrect array size");
 #endif  // end DEFINE_IMAGE_STATUS_NAMES
 
 //-------------------------------------------------------------------------------------------------

Core/GameEngine/Include/GameClient/MetaEvent.h

@@ -57,6 +57,7 @@ static const LookupListRec CategoryListName[] =
 	{"DEBUG",							CATEGORY_DEBUG},
 	{ nullptr, 0}
 };
+static_assert(ARRAY_SIZE(CategoryListName) == CATEGORY_NUM_CATEGORIES + 1, "Incorrect array size");
 
 
 // -------------------------------------------------------------------------------
@@ -319,6 +320,8 @@ enum CommandUsableInType CPP_11(: Int)
 	COMMANDUSABLE_GAME				= (1 << 1), // Command is usable when not in Shell
 	COMMANDUSABLE_OBSERVER		= (1 << 2), // TheSuperHackers @feature Command is usable when observing
 
+	COMMAND_USABLE_IN_TYPE_END, // keep after the last named flag
+
 	COMMANDUSABLE_EVERYWHERE = ~0,
 };
 
@@ -330,6 +333,7 @@ static const char* const TheCommandUsableInNames[] =
 
 	nullptr
 };
+static_assert(1 << (ARRAY_SIZE(TheCommandUsableInNames) - 2) == COMMAND_USABLE_IN_TYPE_END - 1, "Incorrect array size");
 
 // -------------------------------------------------------------------------------
 class MetaMapRec : public MemoryPoolObject

Core/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h

@@ -155,7 +155,7 @@ enum GameSpyColors CPP_11(: Int) {
 	GSCOLOR_MAX
 };
 
-extern Color GameSpyColor[GSCOLOR_MAX];
+extern Color GameSpyColor[];
 
 enum GameSpyBuddyStatus CPP_11(: Int) {
 	BUDDY_OFFLINE,

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

@@ -203,6 +203,7 @@ const char *const theSoundTypeNames[] =
 	"EVERYONE",
 	nullptr
 };
+static_assert(1 << (ARRAY_SIZE(theSoundTypeNames) - 2) == SOUND_TYPE_END - 1, "Incorrect array size");
 
 const char *const theAudioControlNames[] =
 {
@@ -213,4 +214,5 @@ const char *const theAudioControlNames[] =
 	"INTERRUPT",
 	nullptr
 };
+static_assert(1 << (ARRAY_SIZE(theAudioControlNames) - 2) == AUDIO_CONTROL_END - 1, "Incorrect array size");
 

Core/GameEngine/Source/Common/System/Debug.cpp

@@ -121,9 +121,10 @@ static DWORD theMainThreadID = 0;
 char* TheCurrentIgnoreCrashPtr = nullptr;
 #ifdef DEBUG_LOGGING
 UnsignedInt DebugLevelMask = 0;
-const char *TheDebugLevels[DEBUG_LEVEL_MAX] = {
+const char *TheDebugLevels[] = {
 	"NET"
 };
+static_assert(ARRAY_SIZE(TheDebugLevels) == DEBUG_LEVEL_MAX, "Incorrect array size");
 #endif
 
 // ----------------------------------------------------------------------------

Core/GameEngine/Source/Common/System/Radar.cpp

@@ -882,6 +882,7 @@ static RadarColorLookup radarColorLookupTable[] =
 	{ RADAR_EVENT_FAKE,									{   0,	 0,   0,	 0 },	 {    0,	 0,   0,   0 } },
 	{ RADAR_EVENT_INVALID,							{   0,   0,   0,   0 },  {    0,   0,   0,   0 } }
 };
+static_assert(ARRAY_SIZE(radarColorLookupTable) == RADAR_EVENT_NUM_EVENTS, "Incorrect array size");
 
 //-------------------------------------------------------------------------------------------------
 /** Create a new radar event */

Core/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp

@@ -144,6 +144,7 @@ const char *const WindowStatusNames[] = { "ACTIVE", "TOGGLE", "DRAGABLE", "ENABL
 															"USE_OVERLAY_STATES", "NOT_READY", "FLASHING", "ALWAYS_COLOR",
 															"ON_MOUSE_DOWN", /*"SHORTCUT_BUTTON",*/
 															nullptr };
+static_assert(1 << (ARRAY_SIZE(WindowStatusNames) - 2) == WIN_STATUS_END - 1, "Incorrect array size");
 
 const char *const WindowStyleNames[] = { "PUSHBUTTON",	"RADIOBUTTON",	"CHECKBOX",
 														 "VERTSLIDER",	"HORZSLIDER",		"SCROLLLISTBOX",
@@ -152,6 +153,7 @@ const char *const WindowStyleNames[] = { "PUSHBUTTON",	"RADIOBUTTON",	"CHECKBOX"
 														 "TABSTOP",			"TABCONTROL",		"TABPANE",
 														 "COMBOBOX",
 														 nullptr };
+static_assert(1 << (ARRAY_SIZE(WindowStyleNames) - 2) == GWS_END - 1, "Incorrect array size");
 
 // Implement a stack to keep track of parent/child nested window descriptions.
 static GameWindow *windowStack[ WIN_STACK_DEPTH ];

Core/GameEngine/Source/GameClient/GlobalLanguage.cpp

@@ -74,6 +74,7 @@ static const LookupListRec ResolutionFontSizeMethodNames[] =
 	{ "BALANCED", GlobalLanguage::ResolutionFontSizeMethod_Balanced },
 	{ nullptr, 0 }
 };
+static_assert(ARRAY_SIZE(ResolutionFontSizeMethodNames) == GlobalLanguage::ResolutionFontSizeMethod_Count + 1, "Incorrect array size");
 
 static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 {

Core/GameEngine/Source/GameClient/Input/Mouse.cpp

@@ -1266,7 +1266,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 
 	/** @todo This is silly to have to define these names from INI in the code ...
 		* that should be changed (CBD) */
-	static const char *CursorININames[NUM_MOUSE_CURSORS] =
+	static const char *CursorININames[] =
 	{
 		//"InvalidMouseCursor",  // this entry is not actually a mouse cursor, but just a
 														 // reminder that it does exist
@@ -1323,6 +1323,7 @@ Int Mouse::getCursorIndex(const AsciiString& name)
 		"ParticleUplinkCannon",
 
 	};
+	static_assert(ARRAY_SIZE(CursorININames) == NUM_MOUSE_CURSORS, "Incorrect array size");
 
 	for (Int i=0; i<NUM_MOUSE_CURSORS; ++i)
 	{

Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -104,7 +104,7 @@ struct TransferFileRule
 	UnsignedInt maxSize;
 };
 
-static const TransferFileRule transferFileRules[TransferFileType_Count] =
+static const TransferFileRule transferFileRules[] =
 {
 	{ ".map", 5 * 1024 * 1024 },
 	{ ".ini", 2 * 1024 * 1024 },
@@ -113,6 +113,7 @@ static const TransferFileRule transferFileRules[TransferFileType_Count] =
 	{ ".tga", 2 * 1024 * 1024 },
 	{ ".wak", 128 * 1024 },
 };
+static_assert(ARRAY_SIZE(transferFileRules) == TransferFileType_Count, "Incorrect array size");
 
 static TransferFileType getTransferFileType(const char* extension)
 {

Core/GameEngine/Source/GameNetwork/GameSpy/Chat.cpp

@@ -73,6 +73,7 @@ static const FieldParse GameSpyColorFieldParse[] =
 	{ nullptr,					nullptr,						nullptr,						0 }
 
 };
+static_assert(ARRAY_SIZE(GameSpyColorFieldParse) == GSCOLOR_MAX + 1, "Incorrect array size");
 
 void INI::parseOnlineChatColorDefinition( INI* ini )
 {
@@ -81,7 +82,7 @@ void INI::parseOnlineChatColorDefinition( INI* ini )
 }
 
 
-Color GameSpyColor[GSCOLOR_MAX] =
+Color GameSpyColor[] =
 {
 	GameMakeColor(255,255,255,255),	// GSCOLOR_DEFAULT
 	GameMakeColor(255,255,  0,255),	// GSCOLOR_CURRENTROOM
@@ -119,6 +120,7 @@ Color GameSpyColor[GSCOLOR_MAX] =
 	GameMakeColor(255,255,255,255),	// GSCOLOR_MOTD,
 	GameMakeColor(255,255,  0,255),	// GSCOLOR_MOTD_HEADING,
 };
+static_assert(ARRAY_SIZE(GameSpyColor) == GSCOLOR_MAX, "Incorrect array size");
 
 Bool GameSpyInfo::sendChat( UnicodeString message, Bool isAction, GameWindow *playerListbox )
 {

Core/GameEngine/Source/GameNetwork/GameSpyOverlay.cpp

@@ -157,7 +157,7 @@ void RaiseGSMessageBox()
 	* gsOverlays holds a list of the .wnd files used in GS overlays.
 	* The entries *MUST* be in the same order as the GSOverlayType enum.
 	*/
-static const char * gsOverlays[GSOVERLAY_MAX] =
+static const char * gsOverlays[] =
 {
 	"Menus/PopupPlayerInfo.wnd",	// Player info (right-click)
 	"Menus/WOLMapSelectMenu.wnd",	// Map select
@@ -169,6 +169,7 @@ static const char * gsOverlays[GSOVERLAY_MAX] =
 	"Menus/PopupLocaleSelect.wnd",// Prompt for user's locale
 	"Menus/OptionsMenu.wnd",			// popup options
 };
+static_assert(ARRAY_SIZE(gsOverlays) == GSOVERLAY_MAX, "Incorrect array size");
 
 static WindowLayout *overlayLayouts[GSOVERLAY_MAX] =
 {

Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DDebrisDraw.cpp

@@ -226,12 +226,13 @@ void W3DDebrisDraw::doDrawModule(const Matrix3D* transformMtx)
 		}
 		m_renderObject->Set_Transform(*transformMtx);
 
-		static const RenderObjClass::AnimMode TheAnimModes[STATECOUNT] =
+		static const RenderObjClass::AnimMode TheAnimModes[] =
 		{
 			RenderObjClass::ANIM_MODE_ONCE,
 			RenderObjClass::ANIM_MODE_LOOP,
 			RenderObjClass::ANIM_MODE_ONCE
 		};
+		static_assert(ARRAY_SIZE(TheAnimModes) == STATECOUNT, "Incorrect array size");
 
 		Int oldState = m_state;
 		Object* obj = getDrawable()->getObject();

Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp

@@ -266,7 +266,7 @@ inline Bool isCommonMaintainFrameFlagSet(Int a, Int b)
 // Note: these values are saved in save files, so you MUST NOT REMOVE OR CHANGE
 // existing values!
 //
-static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX]=
+static const char *TerrainDecalTextureName[]=
 {
 #ifdef ALLOW_DEMORALIZE
 	"DM_RING",//demoralized
@@ -289,6 +289,7 @@ static const char *TerrainDecalTextureName[TERRAIN_DECAL_MAX]=
 #endif
 	"" //dummy entry for TERRAIN_DECAL_SHADOW_TEXTURE
 };
+static_assert(ARRAY_SIZE(TerrainDecalTextureName) == TERRAIN_DECAL_MAX, "Incorrect array size");
 
 const UnsignedInt NO_NEXT_DURATION = 0xffffffff;
 

Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp

@@ -105,14 +105,16 @@ struct waveInfo
 	const char *m_waveTypeName;			//name of this wave type.
 };
 
-waveInfo waveTypeInfo[WaveTypeMax]=
+waveInfo waveTypeInfo[]=
 {
 	{28.0f, 18.0f, 25.0f, 0.018f, 900, 0.01f, 0.18f, 1500, 0,"wave256.tga","Pond"},	//pond
 	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.5f, 0.18f, 1000, 6267,"wave256.tga","Ocean"},	//ocean
 	{55.0f, 36.0f, 80.0f, 0.015f, 2000, 0.05f, 0.18f, 1000, 6267,"wave256.tga","Close Ocean"},
 	{55.0f, 36.0f, 80.0f, 0.015f, 4000, 0.01f, 0.18f, 2000, 6267,"wave256.tga","Close Ocean Double"},
 	{55.0f, 27.0f, 80.0f, 0.015f, 2000, 0.01f, 8.0f, 2000, 5367,"wave256.tga","Radial"},
+	{0.0f, 0.0f, 0.0f, 0.0f, 0, 0.0f, 0.0f, 0, 0, nullptr, nullptr},	//stationary
 };
+static_assert(ARRAY_SIZE(waveTypeInfo) == WaveTypeMax, "Incorrect array size");
 
 //=============================================================================
 // WaterTracksObj::~WaterTracksObj

Core/Libraries/Source/Compression/CompressionManager.cpp

@@ -41,7 +41,7 @@
 
 const char *CompressionManager::getCompressionNameByType( CompressionType compType )
 {
-	static const char *s_compressionNames[COMPRESSION_MAX+1] = {
+	static const char *s_compressionNames[] = {
 		"No compression",
 		"RefPack",
 		"LZHL",
@@ -57,13 +57,14 @@ const char *CompressionManager::getCompressionNameByType( CompressionType compTy
 		"BTree",
 		"Huff",
 	};
+	static_assert(ARRAY_SIZE(s_compressionNames) == COMPRESSION_MAX + 1, "Incorrect array size");
 	return s_compressionNames[compType];
 }
 
 // For perf timers, so we can have separate ones for compression/decompression
 const char *CompressionManager::getDecompressionNameByType( CompressionType compType )
 {
-	static const char *s_decompressionNames[COMPRESSION_MAX+1] = {
+	static const char *s_decompressionNames[] = {
 		"d_None",
 		"d_RefPack",
 		"d_NoxLZW",
@@ -79,6 +80,7 @@ const char *CompressionManager::getDecompressionNameByType( CompressionType comp
 		"d_BTree",
 		"d_Huff",
 	};
+	static_assert(ARRAY_SIZE(s_decompressionNames) == COMPRESSION_MAX + 1, "Incorrect array size");
 	return s_decompressionNames[compType];
 }
 

Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp

@@ -23,14 +23,15 @@
 
 AssetStatusClass AssetStatusClass::Instance;
 
-const char* ReportCategoryNames[AssetStatusClass::REPORT_COUNT]={
+const char* ReportCategoryNames[]={
 	"LOAD_ON_DEMAND_ROBJ",
 	"LOAD_ON_DEMAND_HANIM",
 	"LOAD_ON_DEMAND_HTREE",
 	"MISSING_ROBJ",
 	"MISSING_HANIM",
 	"MISSING_HTREE"
 };
+static_assert(ARRAY_SIZE(ReportCategoryNames) == AssetStatusClass::REPORT_COUNT, "Incorrect array size");
 
 AssetStatusClass::AssetStatusClass()
 	: