diff options
| author | enneract <trem.redman@gmail.com> | 2014-12-06 23:35:11 +0100 |
|---|---|---|
| committer | enneract <trem.redman@gmail.com> | 2014-12-06 23:35:11 +0100 |
| commit | 05fc0ccd95f486c79e1b073f80245c6cd0179e62 (patch) | |
| tree | bdcbb5e32992291580982b2afd10f9e63cae2640 /src/game/g_active.c | |
| parent | 58903527dbf5fc7d8035ac2349174fe5f58ba2ac (diff) | |
| parent | 1a59a05174d3ed6e6b75b8d9e2b5b074ebf41b38 (diff) | |
Merge branch 'master' of https://github.com/mtiusane/new-edge into bp-on-hud
Diffstat (limited to 'src/game/g_active.c')
| -rw-r--r-- | src/game/g_active.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index f36ec46..c7a8977 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -847,7 +847,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) client->ps.stats[ STAT_STAMINA ] += rate_stamina; } - if( weapon == WP_ABUILD || weapon == WP_ABUILD2 || + if( weapon == WP_ABUILD || BG_InventoryContainsWeapon( WP_HBUILD, client->ps.stats ) ) { // Update build timer @@ -870,7 +870,6 @@ void ClientTimerActions( gentity_t *ent, int msec ) switch( weapon ) { case WP_ABUILD: - case WP_ABUILD2: case WP_HBUILD: // Set validity bit on buildable @@ -1088,8 +1087,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) { client->time10000 -= 10000; - if( ent->client->ps.weapon == WP_ABUILD || - ent->client->ps.weapon == WP_ABUILD2 ) + if( ent->client->ps.weapon == WP_ABUILD ) { AddScore( ent, ALIEN_BUILDER_SCOREINC ); } |