From 2a93a38bfa8feab7e7f9be7332f75f2d2b0036e7 Mon Sep 17 00:00:00 2001 From: enneract Date: Wed, 19 Nov 2014 11:31:42 +0100 Subject: Merge WP_ABUILD and WP_ABUILD2 to free a weapon slot. --- src/game/bg_public.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/game/bg_public.h') diff --git a/src/game/bg_public.h b/src/game/bg_public.h index b7df340..3473924 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -366,7 +366,6 @@ typedef enum WP_MGTURRET, WP_MGTURRET2, WP_ABUILD, - WP_ABUILD2, WP_HBUILD, WP_NUM_WEAPONS } weapon_t; -- cgit From 9e0e1eeeb964f1eaf94622399695e4b4a2d0f1db Mon Sep 17 00:00:00 2001 From: enneract Date: Wed, 19 Nov 2014 19:57:31 +0100 Subject: Implement the Rocket Launcher. --- src/game/bg_public.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/game/bg_public.h') diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 3473924..e4f21ac 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -357,6 +357,7 @@ typedef enum WP_FLAMER, WP_PULSE_RIFLE, WP_LUCIFER_CANNON, + WP_ROCKET_LAUNCHER, WP_GRENADE, WP_SMOKE, WP_MINE, @@ -845,6 +846,8 @@ typedef enum MOD_LCANNON_SPLASH, MOD_FLAMER, MOD_FLAMER_SPLASH, + MOD_ROCKETL, + MOD_ROCKETL_SPLASH, MOD_GRENADE, MOD_PSAWBLADE, MOD_MINE, -- cgit From 1b951e6f35222d76553ed8c824dad2ecc634b7af Mon Sep 17 00:00:00 2001 From: enneract Date: Sat, 22 Nov 2014 22:31:34 +0100 Subject: Keep modNames and meansOfDeath_t enum synced. --- src/game/bg_public.h | 71 +++------------------------------------------------- 1 file changed, 3 insertions(+), 68 deletions(-) (limited to 'src/game/bg_public.h') 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; -- cgit