diff options
| author | enneract <trem.redman@gmail.com> | 2014-11-19 11:31:42 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-11-19 11:31:42 +0100 |
| commit | 2a93a38bfa8feab7e7f9be7332f75f2d2b0036e7 (patch) | |
| tree | 057596e5a50e416cb2e20db81ffd1b070de7a0b5 /src/game/g_weapon.c | |
| parent | fd19ccb037e349286e3b72a1277c58079056fcc2 (diff) | |
Merge WP_ABUILD and WP_ABUILD2 to free a weapon slot.
Diffstat (limited to 'src/game/g_weapon.c')
| -rw-r--r-- | src/game/g_weapon.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index bbc4e08..4e08523 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -937,8 +937,7 @@ void cancelBuildFire( gentity_t *ent ) ent->client->ps.stats[ STAT_BUILDABLE ] = BA_NONE; return; } - if( ent->client->ps.weapon == WP_ABUILD || - ent->client->ps.weapon == WP_ABUILD2 ) + if( ent->client->ps.weapon == WP_ABUILD ) meleeAttack( ent, ABUILDER_CLAW_RANGE, ABUILDER_CLAW_WIDTH, ABUILDER_CLAW_WIDTH, ABUILDER_CLAW_DMG, MOD_ABUILDER_CLAW ); } @@ -1776,7 +1775,7 @@ gclient_t *client; bounceBallFire( ent ); break; - case WP_ABUILD2: + case WP_ABUILD: slowBlobFire( ent ); break; @@ -1877,7 +1876,6 @@ void FireWeapon2( gentity_t *ent ) break; case WP_ABUILD: - case WP_ABUILD2: case WP_HBUILD: cancelBuildFire( ent ); break; @@ -1999,7 +1997,6 @@ void FireWeapon( gentity_t *ent ) FlameTurretFire( ent ); break; case WP_ABUILD: - case WP_ABUILD2: buildFire( ent, MN_A_BUILD ); break; case WP_HBUILD: |