summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMikko Tiusanen <ams@daug.net>2014-11-22 23:37:09 +0200
committerMikko Tiusanen <ams@daug.net>2014-11-22 23:37:09 +0200
commitd3bda2434f3042c5329fe9ade36d47f8c8c1c1d9 (patch)
tree035abbfcbc00e029ec8ecf893248f5b7e8dc7507 /src
parent19bb5b02944dec8f221f44efbd4ad9eee308a3b0 (diff)
parent7050e49e17ae821379c0bb297623bee5362758bc (diff)
Merge branch 'master' of github.com:mtiusane/new-edge
Diffstat (limited to 'src')
-rw-r--r--src/game/bg_mod.h68
-rw-r--r--src/game/bg_public.h71
-rw-r--r--src/game/g_combat.c74
3 files changed, 74 insertions, 139 deletions
diff --git a/src/game/bg_mod.h b/src/game/bg_mod.h
new file mode 100644
index 0000000..5e4245b
--- /dev/null
+++ b/src/game/bg_mod.h
@@ -0,0 +1,68 @@
+MOD( MOD_UNKNOWN ),
+MOD( MOD_HDOG ),
+MOD( MOD_SHOTGUN ),
+MOD( MOD_BLASTER ),
+MOD( MOD_PAINSAW ),
+MOD( MOD_MACHINEGUN ),
+MOD( MOD_CHAINGUN ),
+MOD( MOD_PRIFLE ),
+MOD( MOD_MDRIVER ),
+MOD( MOD_LASGUN ),
+MOD( MOD_LCANNON ),
+MOD( MOD_LCANNON_SPLASH ),
+MOD( MOD_FLAMER ),
+MOD( MOD_FLAMER_SPLASH ),
+MOD( MOD_ROCKETL ),
+MOD( MOD_ROCKETL_SPLASH ),
+MOD( MOD_GRENADE ),
+MOD( MOD_PSAWBLADE ),
+MOD( MOD_MINE ),
+MOD( MOD_FLAMES ),
+MOD( MOD_SMOKE ),
+MOD( MOD_SPITEFUL_ABCESS ),
+MOD( MOD_WATER ),
+MOD( MOD_SLIME ),
+MOD( MOD_LAVA ),
+MOD( MOD_CRUSH ),
+MOD( MOD_TELEFRAG ),
+MOD( MOD_FALLING ),
+MOD( MOD_SUICIDE ),
+MOD( MOD_TARGET_LASER ),
+MOD( MOD_TRIGGER_HURT ),
+MOD( MOD_ABUILDER_CLAW ),
+MOD( MOD_LEVEL0_BITE ),
+MOD( MOD_LEVEL1_CLAW ),
+MOD( MOD_LEVEL1_PCLOUD ),
+MOD( MOD_LEVEL3_CLAW ),
+MOD( MOD_LEVEL3_POUNCE ),
+MOD( MOD_LEVEL5_POUNCE ),
+MOD( MOD_LEVEL5_PRICKLES ),
+MOD( MOD_LEVEL3_BOUNCEBALL ),
+MOD( MOD_LEVEL2_CLAW ),
+MOD( MOD_LEVEL2_ZAP ),
+MOD( MOD_LEVEL5_CLAW ),
+MOD( MOD_LEVEL5_ZAP ),
+MOD( MOD_LEVEL5_BOUNCEBALL ),
+MOD( MOD_LEVEL2_BOUNCEBALL ),
+MOD( MOD_LEVEL4_CLAW ),
+MOD( MOD_LEVEL4_TRAMPLE ),
+MOD( MOD_LEVEL4_CRUSH ),
+MOD( MOD_SLOWBLOB ),
+MOD( MOD_POISON ),
+MOD( MOD_INFECTION ),
+MOD( MOD_SWARM ),
+MOD( MOD_MD2 ),
+MOD( MOD_HSPAWN ),
+MOD( MOD_TESLAGEN ),
+MOD( MOD_MGTURRET ),
+MOD( MOD_MGTURRET2 ),
+MOD( MOD_REACTOR ),
+MOD( MOD_ASPAWN ),
+MOD( MOD_ATUBE ),
+MOD( MOD_OVERMIND ),
+MOD( MOD_SLAP ),
+MOD( MOD_DECONSTRUCT ),
+MOD( MOD_REPLACE ),
+MOD( MOD_NOCREEP ),
+MOD( MOD_NOBP ),
+MOD( MOD_ABOMB )
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index e4f21ac..2ca9e32 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -832,74 +832,9 @@ typedef enum
// means of death
typedef enum
{
- MOD_UNKNOWN,
- MOD_HDOG,
- MOD_SHOTGUN,
- MOD_BLASTER,
- MOD_PAINSAW,
- MOD_MACHINEGUN,
- MOD_CHAINGUN,
- MOD_PRIFLE,
- MOD_MDRIVER,
- MOD_LASGUN,
- MOD_LCANNON,
- MOD_LCANNON_SPLASH,
- MOD_FLAMER,
- MOD_FLAMER_SPLASH,
- MOD_ROCKETL,
- MOD_ROCKETL_SPLASH,
- MOD_GRENADE,
- MOD_PSAWBLADE,
- MOD_MINE,
- MOD_FLAMES,
- MOD_SMOKE,
- MOD_SPITEFUL_ABCESS,
- MOD_WATER,
- MOD_SLIME,
- MOD_LAVA,
- MOD_CRUSH,
- MOD_TELEFRAG,
- MOD_FALLING,
- MOD_SUICIDE,
- MOD_TARGET_LASER,
- MOD_TRIGGER_HURT,
- MOD_ABUILDER_CLAW,
- MOD_LEVEL0_BITE,
- MOD_LEVEL1_CLAW,
- MOD_LEVEL1_PCLOUD,
- MOD_LEVEL3_CLAW,
- MOD_LEVEL3_POUNCE,
- MOD_LEVEL5_POUNCE,
- MOD_LEVEL5_PRICKLES,
- MOD_LEVEL3_BOUNCEBALL,
- MOD_LEVEL2_CLAW,
- MOD_LEVEL2_ZAP,
- MOD_LEVEL5_CLAW,
- MOD_LEVEL5_ZAP,
- MOD_LEVEL5_BOUNCEBALL,
- MOD_LEVEL2_BOUNCEBALL,
- MOD_LEVEL4_CLAW,
- MOD_LEVEL4_TRAMPLE,
- MOD_LEVEL4_CRUSH,
- MOD_SLOWBLOB,
- MOD_POISON,
- MOD_INFECTION,
- MOD_SWARM,
- MOD_MD2,
- MOD_HSPAWN,
- MOD_TESLAGEN,
- MOD_MGTURRET,
- MOD_MGTURRET2,
- MOD_REACTOR,
- MOD_ASPAWN,
- MOD_ATUBE,
- MOD_OVERMIND,
- MOD_SLAP,
- MOD_DECONSTRUCT,
- MOD_REPLACE,
- MOD_NOCREEP,
- MOD_NOBP,
- MOD_ABOMB
+#define MOD(x) x
+#include "bg_mod.h"
+#undef MOD
} meansOfDeath_t;
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index b437e45..e43d036 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -80,77 +80,9 @@ void LookAtKiller( gentity_t *self, gentity_t *inflictor, gentity_t *attacker )
// these are just for logging, the client prints its own messages
char *modNames[ ] =
{
- "MOD_UNKNOWN",
- "MOD_HDOG",
- "MOD_SHOTGUN",
- "MOD_BLASTER",
- "MOD_PAINSAW",
- "MOD_MACHINEGUN",
- "MOD_CHAINGUN",
- "MOD_PRIFLE",
- "MOD_MDRIVER",
- "MOD_LASGUN",
- "MOD_LCANNON",
- "MOD_LCANNON_SPLASH",
- "MOD_FLAMER",
- "MOD_FLAMER_SPLASH",
- "MOD_ROCKETL",
- "MOD_ROCKETL_SPLASH",
- "MOD_GRENADE",
- "MOD_PSAWBLADE",
- "MOD_MINE",
- "MOD_FLAMES",
- "MOD_SMOKE",
- "MOD_SPITEFUL_ABCESS",
- "MOD_WATER",
- "MOD_SLIME",
- "MOD_LAVA",
- "MOD_CRUSH",
- "MOD_TELEFRAG",
- "MOD_FALLING",
- "MOD_SUICIDE",
- "MOD_TARGET_LASER",
- "MOD_TRIGGER_HURT",
-
- "MOD_ABUILDER_CLAW",
- "MOD_LEVEL0_BITE",
- "MOD_LEVEL1_CLAW",
- "MOD_LEVEL1_PCLOUD",
- "MOD_LEVEL3_CLAW",
- "MOD_LEVEL3_POUNCE",
- "MOD_LEVEL5_POUNCE",
- "MOD_LEVEL5_PRICKLES",
- "MOD_LEVEL3_BOUNCEBALL",
- "MOD_LEVEL2_CLAW",
- "MOD_LEVEL2_ZAP",
- "MOD_LEVEL5_CLAW",
- "MOD_LEVEL5_ZAP",
- "MOD_LEVEL5_BOUNCEBALL",
- "MOD_LEVEL2_BOUNCEBALL",
- "MOD_LEVEL4_CLAW",
- "MOD_LEVEL4_TRAMPLE",
- "MOD_LEVEL4_CRUSH",
-
- "MOD_SLOWBLOB",
- "MOD_POISON",
- "MOD_INFECTION",
- "MOD_SWARM",
- "MOD_MD2",
- "MOD_HSPAWN",
- "MOD_TESLAGEN",
- "MOD_MGTURRET",
- "MOD_MGTURRET2",
- "MOD_REACTOR",
-
- "MOD_ASPAWN",
- "MOD_ATUBE",
- "MOD_OVERMIND",
- "MOD_SLAP",
- "MOD_DECONSTRUCT",
- "MOD_REPLACE",
- "MOD_NOCREEP",
- "MOD_NOBP",
- "MOD_ABOMB"
+#define MOD(x) #x
+#include "bg_mod.h"
+#undef MOD
};
/*