Merge pull request #48 from LegendaryGuard/bg_mods

Simplify mean of death (MOD_*) declaration to a single line of each

Author: ec-

README.md

@@ -23,6 +23,7 @@ Unofficial Quake III Arena gamecode patch
  * high-quality proportional font renderer
  * single-line cvar declaration, improved cvar code readability and development efficiency
  * single-line event (EV_*) declaration
+ * single-line mean of death (MOD_*) declaration
 
 # TODO:
 

code/game/bg_mods.h

@@ -0,0 +1,45 @@
+#ifdef MOD_ENUMS
+	#define DECLARE_MOD( mod ) mod
+#endif
+
+#ifdef MOD_STRINGS
+	#define DECLARE_MOD( mod ) #mod
+#endif
+
+DECLARE_MOD( MOD_UNKNOWN ),
+DECLARE_MOD( MOD_SHOTGUN ),
+DECLARE_MOD( MOD_GAUNTLET ),
+DECLARE_MOD( MOD_MACHINEGUN ),
+DECLARE_MOD( MOD_GRENADE ),
+DECLARE_MOD( MOD_GRENADE_SPLASH ),
+DECLARE_MOD( MOD_ROCKET ),
+DECLARE_MOD( MOD_ROCKET_SPLASH ),
+DECLARE_MOD( MOD_PLASMA ),
+DECLARE_MOD( MOD_PLASMA_SPLASH ),
+DECLARE_MOD( MOD_RAILGUN ),
+DECLARE_MOD( MOD_LIGHTNING ),
+DECLARE_MOD( MOD_BFG ),
+DECLARE_MOD( MOD_BFG_SPLASH ),
+DECLARE_MOD( MOD_WATER ),
+DECLARE_MOD( MOD_SLIME ),
+DECLARE_MOD( MOD_LAVA ),
+DECLARE_MOD( MOD_CRUSH ),
+DECLARE_MOD( MOD_TELEFRAG ),
+DECLARE_MOD( MOD_FALLING ),
+DECLARE_MOD( MOD_SUICIDE ),
+DECLARE_MOD( MOD_TARGET_LASER ),
+DECLARE_MOD( MOD_TRIGGER_HURT ),
+#ifdef MISSIONPACK
+DECLARE_MOD( MOD_NAIL ),
+DECLARE_MOD( MOD_CHAINGUN ),
+DECLARE_MOD( MOD_PROXIMITY_MINE ),
+DECLARE_MOD( MOD_KAMIKAZE ),
+DECLARE_MOD( MOD_JUICED ),
+#endif
+DECLARE_MOD( MOD_GRAPPLE )
+
+#ifdef MOD_ENUMS
+	, DECLARE_MOD( MOD_NUM_MAX )
+#endif
+
+#undef DECLARE_MOD

code/game/bg_public.h

@@ -471,37 +471,9 @@ typedef enum {
 
 // means of death
 typedef enum {
-	MOD_UNKNOWN,
-	MOD_SHOTGUN,
-	MOD_GAUNTLET,
-	MOD_MACHINEGUN,
-	MOD_GRENADE,
-	MOD_GRENADE_SPLASH,
-	MOD_ROCKET,
-	MOD_ROCKET_SPLASH,
-	MOD_PLASMA,
-	MOD_PLASMA_SPLASH,
-	MOD_RAILGUN,
-	MOD_LIGHTNING,
-	MOD_BFG,
-	MOD_BFG_SPLASH,
-	MOD_WATER,
-	MOD_SLIME,
-	MOD_LAVA,
-	MOD_CRUSH,
-	MOD_TELEFRAG,
-	MOD_FALLING,
-	MOD_SUICIDE,
-	MOD_TARGET_LASER,
-	MOD_TRIGGER_HURT,
-#ifdef MISSIONPACK
-	MOD_NAIL,
-	MOD_CHAINGUN,
-	MOD_PROXIMITY_MINE,
-	MOD_KAMIKAZE,
-	MOD_JUICED,
-#endif
-	MOD_GRAPPLE
+#define MOD_ENUMS
+	#include "bg_mods.h"
+#undef MOD_ENUMS
 } meansOfDeath_t;
 
 

code/game/g_combat.c

@@ -267,38 +267,11 @@ void body_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int d
 
 
 // these are just for logging, the client prints its own messages
-char	*modNames[] = {
-	"MOD_UNKNOWN",
-	"MOD_SHOTGUN",
-	"MOD_GAUNTLET",
-	"MOD_MACHINEGUN",
-	"MOD_GRENADE",
-	"MOD_GRENADE_SPLASH",
-	"MOD_ROCKET",
-	"MOD_ROCKET_SPLASH",
-	"MOD_PLASMA",
-	"MOD_PLASMA_SPLASH",
-	"MOD_RAILGUN",
-	"MOD_LIGHTNING",
-	"MOD_BFG",
-	"MOD_BFG_SPLASH",
-	"MOD_WATER",
-	"MOD_SLIME",
-	"MOD_LAVA",
-	"MOD_CRUSH",
-	"MOD_TELEFRAG",
-	"MOD_FALLING",
-	"MOD_SUICIDE",
-	"MOD_TARGET_LASER",
-	"MOD_TRIGGER_HURT",
-#ifdef MISSIONPACK
-	"MOD_NAIL",
-	"MOD_CHAINGUN",
-	"MOD_PROXIMITY_MINE",
-	"MOD_KAMIKAZE",
-	"MOD_JUICED",
-#endif
-	"MOD_GRAPPLE"
+char	*modNames[MOD_NUM_MAX] = {
+#define MOD_STRINGS
+	#include "bg_mods.h"
+#undef MOD_STRINGS
+	"NULL"	// avoid -Wpedantic warnings
 };
 
 #ifdef MISSIONPACK