diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-11-22 20:40:57 +0200 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-11-22 20:40:57 +0200 |
| commit | d2a3f26bc4c0699f3a4bb2a08a3f48ca1ba5d9c6 (patch) | |
| tree | aedcd68b4c9a6c1525b3de30a3dbd5b2b2c34639 /src/game/g_active.c | |
| parent | 73d005979462a1b10169010cfc69f3d09e9823c7 (diff) | |
| parent | 69382df33438a83a58645b9912788a47cd24552d (diff) | |
Merge branch 'master' of github.com:mtiusane/new-edge
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 ); } |