From 931e88a788c5214bcbb24827bd5574c97abe99cb Mon Sep 17 00:00:00 2001
From: Roman Tetelman <kevlarman@gmail.com>
Date: Sat, 3 Oct 2009 12:19:06 +0000
Subject: * shut up annoying noise when aiming ckit on build timer at damaged
buildables
---
src/game/g_weapon.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index 489181aa..8bf63fdd 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -796,7 +796,8 @@ void CheckCkitRepair( gentity_t *ent )
gentity_t *traceEnt;
int bHealth;
- if( ent->client->ps.weaponTime )
+ if( ent->client->ps.weaponTime > 0 ||
+ ent->client->ps.stats[ STAT_MISC ] > 0 )
return;
// Construction kit repair
@@ -810,12 +811,6 @@ void CheckCkitRepair( gentity_t *ent )
if( tr.fraction < 1.0f && traceEnt->spawned && traceEnt->health > 0 &&
traceEnt->s.eType == ET_BUILDABLE && traceEnt->buildableTeam == TEAM_HUMANS )
{
- if( ent->client->ps.stats[ STAT_MISC ] > 0 )
- {
- G_AddEvent( ent, EV_BUILD_DELAY, ent->client->ps.clientNum );
- return;
- }
-
bHealth = BG_Buildable( traceEnt->s.modelindex )->health;
if( traceEnt->health < bHealth )
{
--
cgit