refactor: Remove superfluous enum values

xezon · xezon · commit 6d786506bc99 · 2025-09-16T19:32:05.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h
@@ -166,8 +166,6 @@ enum CellShroudStatus CPP_11(: Int)
 	CELLSHROUD_CLEAR,
 	CELLSHROUD_FOGGED,
 	CELLSHROUD_SHROUDED,
-
-	CELLSHROUD_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
@@ -180,8 +178,6 @@ enum ObjectShroudStatus CPP_11(: Int)
 	OBJECTSHROUD_FOGGED,				///< object is completely fogged
 	OBJECTSHROUD_SHROUDED,			///< object is completely shrouded
 	OBJECTSHROUD_INVALID_BUT_PREVIOUS_VALID,			///< indeterminate state, will recompute, BUT previous status is valid, don't reset (used for save/load)
-
-	OBJECTSHROUD_COUNT
 };
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h
@@ -57,8 +57,6 @@ enum SaveLoadLayoutType CPP_11(: Int)
 	SLLT_SAVE_AND_LOAD,
 	SLLT_LOAD_ONLY,
 	SLLT_SAVE_ONLY,
-
-	SLLT_NUM_TYPES // keep this last, why? don't know, it's not really used, but we like it this way
 };
 
 // ------------------------------------------------------------------------------------------------
@@ -86,8 +84,6 @@ enum SaveFileType CPP_11(: Int)
 {
 	SAVE_FILE_TYPE_NORMAL,		///< a regular save game at any arbitrary point in the game
 	SAVE_FILE_TYPE_MISSION,		///< a save game in between missions (a mission save)
-
-	SAVE_FILE_TYPE_NUM_TYPES
 };
 
 // ------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h
@@ -588,8 +588,6 @@ enum ControlBarContext CPP_11(: Int)
 	CB_CONTEXT_OBSERVER_INFO,					///< for when we want to populate the player info
 	CB_CONTEXT_OBSERVER_LIST,					///< for when we want to update the observer list
 	CB_CONTEXT_OCL_TIMER,							///< Countdown for OCL spewers
-
-	NUM_CB_CONTEXTS
 };
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h
@@ -83,7 +83,6 @@ class DebugDisplayInterface
 			RED,
 			GREEN,
 			BLUE,
-			NUM_COLORS
 		};
 
 		virtual ~DebugDisplayInterface() {};
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -633,7 +633,6 @@ friend class Drawable;	// for selection/deselection transactions
 #ifdef RTS_DEBUG
 		DEBUG_HINT,
 #endif
-		NUM_HINT_TYPES  // keep this one last
 	};
 
 	// mouse mode interface
@@ -642,7 +641,6 @@ friend class Drawable;	// for selection/deselection transactions
 		MOUSEMODE_DEFAULT = 0,
 		MOUSEMODE_BUILD_PLACE,
 		MOUSEMODE_GUI_COMMAND,
-		MOUSEMODE_MAX
 	};
 
 	enum { MAX_MOVE_HINTS = 256 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h
@@ -96,8 +96,6 @@ class View : public Snapshot
     WTS_INSIDE_FRUSTUM = 0, // On the screen (inside frustum of camera)
     WTS_OUTSIDE_FRUSTUM,    // Return is valid but off the screen (outside frustum of camera)
     WTS_INVALID,            // No transform possible
-
-    WTS_COUNT
   };
 
 public:
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h
@@ -413,8 +413,6 @@ enum AICommandType CPP_11(: Int)	// Stored in save file, do not reorder/renumber
 	AICMD_EVACUATE_INSTANTLY,
 	AICMD_EXIT_INSTANTLY,
 	AICMD_GUARD_RETALIATE,
-
-	AICMD_NUM_COMMANDS	// keep last
 };
 
 struct AICommandParms
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
@@ -106,8 +106,6 @@ enum AIStateType CPP_11(: Int)
 	AI_BUSY,																	///< This is a state that things will be in when they are busy doing random stuff that doesn't require AI interaction.
 	AI_EXIT_INSTANTLY,												///< exit this obj, without waiting -- do it in the onEnter! This frame!
 	AI_GUARD_RETALIATE,												///< attacks attacker but with restrictions (hybrid of attack and guard).
-
-	NUM_AI_STATES
 };
 
 //-----------------------------------------------------------------------------------------------------------
@@ -202,7 +200,6 @@ enum StateType CPP_11(: Int)
 		APPROACH_TARGET,											///< Approach a non-moving target.
 		AIM_AT_TARGET,												///< rotate to face GoalObject or GoalPosition
 		FIRE_WEAPON,													///< fire the machine owner's current weapon
-		NUM_ATTACK_STATES
 	};
 	AttackStateMachine( Object *owner, AIAttackState* att, AsciiString name, Bool follow, Bool attackingObject, Bool forceAttacking );
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h
@@ -45,8 +45,6 @@ enum FlammabilityStatusType CPP_11(: Int)
 	FS_NORMAL = 0,
 	FS_AFLAME,
 	FS_BURNED,
-
-	FS_NORMAL_COUNT	// keep last
 };
 
 //-------------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -103,7 +103,6 @@ enum ValueOrThreat CPP_11(: Int)
 {
 	VOT_CashValue = 1,
 	VOT_ThreatValue,
-	VOT_NumItems
 };
 
 // ----------------------------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h
@@ -53,7 +53,6 @@ class BuddyRequest
 		BUDDYREQUEST_DENYADD,			// don't allow someone to add you to their buddy list
 		BUDDYREQUEST_SETSTATUS,		// Set our status
 		BUDDYREQUEST_DELETEACCT,	// Delete our account
-		BUDDYREQUEST_MAX
 	} buddyRequestType;
 
 	union
@@ -106,7 +105,6 @@ class BuddyResponse
 		BUDDYRESPONSE_MESSAGE,
 		BUDDYRESPONSE_REQUEST,
 		BUDDYRESPONSE_STATUS,
-		BUDDYRESPONSE_MAX
 	} buddyResponseType;
 
 	GPProfile profile;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h
@@ -52,7 +52,6 @@ enum GameSortType CPP_11(: Int)
 	GAMESORT_ALPHA_DESCENDING,
 	GAMESORT_PING_ASCENDING,
 	GAMESORT_PING_DESCENDING,
-	GAMESORT_MAX,
 };
 
 Bool HandleSortButton( NameKeyType sortButton );
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h
@@ -168,7 +168,6 @@ enum GameSpyBuddyStatus CPP_11(: Int) {
 	BUDDY_LOADING,
 	BUDDY_PLAYING,
 	BUDDY_MATCHING,
-	BUDDY_MAX
 };
 
 // ---------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h
@@ -197,7 +197,6 @@ enum DisconnectReason CPP_11(: Int)
 	DISCONNECT_GP_NEWUSER_BAD_PASSWORD,
 	DISCONNECT_GP_NEWPROFILE_BAD_NICK,
 	DISCONNECT_GP_NEWPROFILE_BAD_OLD_NICK,
-	DISCONNECT_MAX,
 };
 
 enum QMStatus CPP_11(: Int)
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h
@@ -75,7 +75,6 @@ class LANAPIInterface : public SubsystemInterface
 		LANCHAT_NORMAL = 0,
 		LANCHAT_EMOTE,
 		LANCHAT_SYSTEM,
-		LANCHAT_MAX
 	};
 
 	// Request functions generate network traffic
@@ -110,7 +109,6 @@ class LANAPIInterface : public SubsystemInterface
 		RET_GAME_GONE,			// OnGameJoin
 		RET_BUSY,						// OnGameCreate/Join/etc if another action is in progress
 		RET_UNKNOWN,				// Default message for oddity
-		RET_MAX
 	};
 	UnicodeString getErrorStringFromReturnType( ReturnType ret );
 
@@ -220,7 +218,6 @@ class LANAPI : public LANAPIInterface
 		ACT_JOIN,
 		ACT_JOINDIRECTCONNECT,
 		ACT_LEAVE,
-		ACT_MAX
 	};
 
 	static const UnsignedInt s_resendDelta; // in ms
@@ -319,8 +316,6 @@ struct LANMessage
 		MSG_INACTIVE,						///< I've alt-tabbed out.  Unaccept me cause I'm a poo-flinging monkey.
 
 		MSG_REQUEST_GAME_INFO,	///< For direct connect, get the game info from a specific IP Address
-
-		MSG_MAX
 	} LANMessageType;
 
 	WideChar name[g_lanPlayerNameLength+1]; ///< My name, for convenience
diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h
@@ -156,8 +156,6 @@ enum NetCommandType CPP_11(: Int) {
 	NETCOMMANDTYPE_DISCONNECTFRAME,
 	NETCOMMANDTYPE_DISCONNECTSCREENOFF,
 	NETCOMMANDTYPE_DISCONNECTEND,
-
-	NETCOMMANDTYPE_MAX
 };
 
 enum NetLocalStatus CPP_11(: Int) {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -223,8 +223,6 @@ enum Detail CPP_11(: Int)
 	MEDIUMDETAIL,
 	LOWDETAIL,
 	CUSTOMDETAIL,
-
-	DETAIL,
 };
 
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
@@ -121,7 +121,6 @@ enum CallbackType
 	CALLBACK_RECVMESSAGE,
 	CALLBACK_RECVREQUEST,
 	CALLBACK_RECVSTATUS,
-	CALLBACK_MAX
 };
 
 void callbackWrapper( GPConnection *con, void *arg, void *param )
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
@@ -509,7 +509,6 @@ enum CallbackType
 	CALLBACK_RECVMESSAGE,
 	CALLBACK_RECVREQUEST,
 	CALLBACK_RECVSTATUS,
-	CALLBACK_MAX
 };
 
 void connectCallbackWrapper( PEER peer, PEERBool success, int failureReason, void *param )
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h
@@ -73,7 +73,6 @@ class WaterRenderObjClass : public Snapshot,
 		WATER_TYPE_1_FB_REFLECTION,		//legacy frame buffer reflection (non translucent)
 		WATER_TYPE_2_PVSHADER,		//pixel/vertex shader, texture reflection
 		WATER_TYPE_3_GRIDMESH,		//3D Mesh based water
-		WATER_TYPE_MAX		// end of enumeration
 	};
 
 	WaterRenderObjClass(void);
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h
@@ -44,10 +44,6 @@
 
 #include "always.h"
 
-#if defined (SR_OS_SOLARIS)
-#undef PASS_MAX
-#endif
-
 class DX8Wrapper;
 struct W3dMaterial3Struct;
 class StringClass;
@@ -95,7 +91,6 @@ class ShaderClass
 	{
 		ALPHATEST_DISABLE= 0,// disable alpha testing (default)
 		ALPHATEST_ENABLE,		// enable alpha testing
-		ALPHATEST_MAX			// end of enumeration
 	};
 
 	enum DepthCompareType
@@ -108,21 +103,18 @@ class ShaderClass
 		PASS_NOTEQUAL,       // pass if incoming not equal to stored
 		PASS_GEQUAL,			// pass if incoming greater than or equal to stored
 		PASS_ALWAYS,			// pass always
-		PASS_MAX					// end of enumeration
 	};
 
 	enum DepthMaskType
 	{
 		DEPTH_WRITE_DISABLE=0,	// disable depth buffer writes
 		DEPTH_WRITE_ENABLE,		// enable depth buffer writes		(default)
-		DEPTH_WRITE_MAX			// end of enumeration
 	};
 
 	enum ColorMaskType
 	{
 		COLOR_WRITE_DISABLE=0,	// disable color buffer writes
 		COLOR_WRITE_ENABLE,		// enable color buffer writes		(default)
-		COLOR_WRITE_MAX			// end of enumeration
 	};
 
  	enum DetailAlphaFuncType
@@ -131,7 +123,6 @@ class ShaderClass
 		DETAILALPHA_DETAIL,		// other
 		DETAILALPHA_SCALE,		// local * other
 		DETAILALPHA_INVSCALE,	// ~(~local * ~other) = local + (1-local)*other
-		DETAILALPHA_MAX			// end of enumeration
 	};
 
 	enum DetailColorFuncType
@@ -149,22 +140,18 @@ class ShaderClass
 		DETAILCOLOR_ADDSIGNED2X,	// 1010	(local + other - 0.5) * 2
 		DETAILCOLOR_SCALE2X,			// 1011	local * other * 2
 		DETAILCOLOR_MODALPHAADDCOLOR,	// 1100 local + localAlpha * other
-
-		DETAILCOLOR_MAX				//			end of enumeration
 	};
 
 	enum CullModeType
 	{
 		CULL_MODE_DISABLE=0,
 		CULL_MODE_ENABLE,
-		CULL_MODE_MAX
 	};
 
 	enum NPatchEnableType
 	{
 		NPATCH_DISABLE=0,
 		NPATCH_ENABLE,
-		NPATCH_TYPE_MAX
 	};
 
   	enum DstBlendFuncType
@@ -184,7 +171,6 @@ class ShaderClass
  		FOG_ENABLE,        	// apply fog, f*fogColor + (1-f)*fragment
  		FOG_SCALE_FRAGMENT,  // fog scalar value multiplies fragment, (1-f)*fragment
  		FOG_WHITE,				// fog scalar value replaces fragment, f*fogColor
-		FOG_MAX					// end of enumeration
  	};
 
  	enum PriGradientType
@@ -195,14 +181,12 @@ class ShaderClass
 		GRADIENT_BUMPENVMAP,				// 011	environment-mapped bump mapping
 		GRADIENT_BUMPENVMAPLUMINANCE,	// 100	environment-mapped bump mapping with luminance control
 		GRADIENT_MODULATE2X,				// 101	modulate fragment ARGB by gradient ARGB and multiply RGB by 2
-		GRADIENT_MAX						// end of enumeration
  	};
 
 	enum SecGradientType
 	{
 		SECONDARY_GRADIENT_DISABLE=0,	// don't draw secondary gradient (default)
 		SECONDARY_GRADIENT_ENABLE,    // add secondary gradient RGB to fragment RGB
-		SECONDARY_GRADIENT_MAX			// end of enumeration
 	};
 
 	enum SrcBlendFuncType
@@ -218,7 +202,6 @@ class ShaderClass
 	{
 		TEXTURING_DISABLE=0, // no texturing (treat fragment initial color as 1,1,1,1)
 		TEXTURING_ENABLE,    // enable texturing
-		TEXTURING_MAX			// end of enumeration
 	};
 
 	enum StaticSortCategoryType
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h
@@ -70,8 +70,6 @@ typedef enum
 	MODE_RESIZE_LEFT,								///< resize dragging left vertical
 	MODE_KEYBOARD_MOVE,							///< moving windows with the Keyboard
 
-	MODE_NUM_MODES									///< keep this last!
-
 } EditMode;
 
 //-------------------------------------------------------------------------------------------------
@@ -103,8 +101,6 @@ typedef enum
 	CURSOR_SIZE_WE,
 	CURSOR_WAIT,
 
-	CURSOR_NUM_CURSORS  // keep last
-
 } CursorType;
 
 //-------------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ enum ValueOrThreat CPP_11(: Int)`
`103`	`103`	`{`
`104`	`104`	`VOT_CashValue = 1,`
`105`	`105`	`VOT_ThreatValue,`
`106`		`- VOT_NumItems`
`107`	`106`	`};`
`108`	`107`
`109`	`108`	`// ----------------------------------------------------------------------------------------------`