diff options
| author | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-12-14 14:56:38 +0100 |
| commit | 7c02e34b08a4e44a7f7935bf6b1bee45c3a8df6c (patch) | |
| tree | e3ff69394522a6cc7dd11edf27cd69df6c0a5819 /src/game/bg_public.h | |
| parent | bd6fc418d171378de5de2b7450e22f70b4899b5c (diff) | |
| parent | 5130cdd357c5b3b442d39ee05052739419456e77 (diff) | |
Merge branch 'newguns'
Conflicts:
src/cgame/cg_local.h
src/cgame/cg_main.c
Diffstat (limited to 'src/game/bg_public.h')
| -rw-r--r-- | src/game/bg_public.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 9edd57b..bbf064e 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -357,10 +357,10 @@ typedef enum WP_CHAINGUN, WP_FLAMER, WP_PULSE_RIFLE, + WP_LIGHTNING_GUN, WP_LUCIFER_CANNON, WP_ROCKET_LAUNCHER, WP_GRENADE, - WP_SMOKE, WP_MINE, WP_LOCKBLOB_LAUNCHER, WP_HIVE, |