summaryrefslogtreecommitdiff
path: root/src/game/bg_public.h
diff options
context:
space:
mode:
authorMikko Tiusanen <ams@daug.net>2014-11-22 20:40:57 +0200
committerMikko Tiusanen <ams@daug.net>2014-11-22 20:40:57 +0200
commitd2a3f26bc4c0699f3a4bb2a08a3f48ca1ba5d9c6 (patch)
treeaedcd68b4c9a6c1525b3de30a3dbd5b2b2c34639 /src/game/bg_public.h
parent73d005979462a1b10169010cfc69f3d09e9823c7 (diff)
parent69382df33438a83a58645b9912788a47cd24552d (diff)
Merge branch 'master' of github.com:mtiusane/new-edge
Diffstat (limited to 'src/game/bg_public.h')
-rw-r--r--src/game/bg_public.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index b7df340..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,
@@ -366,7 +367,6 @@ typedef enum
WP_MGTURRET,
WP_MGTURRET2,
WP_ABUILD,
- WP_ABUILD2,
WP_HBUILD,
WP_NUM_WEAPONS
} weapon_t;
@@ -846,6 +846,8 @@ typedef enum
MOD_LCANNON_SPLASH,
MOD_FLAMER,
MOD_FLAMER_SPLASH,
+ MOD_ROCKETL,
+ MOD_ROCKETL_SPLASH,
MOD_GRENADE,
MOD_PSAWBLADE,
MOD_MINE,