summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2017-04-13 11:30:00 +0000
committer/dev/humancontroller <devhc@example.com>2017-04-15 17:24:20 +0200
commitade61ba16bcaa053255d8564f6ed45cfb72df13f (patch)
treefc977333f166bbb5a4b3cf55ae97564294678812
parenta2acd48085c60e956b1cad6a9fa12578acbeec5f (diff)
remove the "poison running out" blinking functionality
the real reason behind this is to avoid changing the playerstate's boosttime stat almost every frame
-rw-r--r--src/cgame/cg_draw.c10
-rw-r--r--src/game/g_active.c2
2 files changed, 1 insertions, 11 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 9efed5e..f4bf88e 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -825,15 +825,7 @@ static void CG_DrawPlayerBoosterBolt( rectDef_t *rect, vec4_t color, qhandle_t s
Vector4Copy( color, localColor );
if( boosted )
- {
- if( ps->stats[ STAT_BOOSTTIME ] > BOOST_TIME - 3000 )
- {
- qboolean flash = ( ps->stats[ STAT_BOOSTTIME ] / 500 ) % 2;
-
- if( flash )
- localColor[ 3 ] = 1.0f;
- }
- }
+ localColor[ 3 ] = 1.0f;
trap_R_SetColor( localColor );
CG_DrawPic( rect->x, rect->y, rect->w, rect->h, shader );
diff --git a/src/game/g_active.c b/src/game/g_active.c
index bfbec2a..4aa38cb 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -1682,8 +1682,6 @@ void ClientThink_real( gentity_t *ent )
client->lastSlowTime + ABUILDER_BLOB_TIME < level.time )
client->ps.stats[ STAT_STATE ] &= ~SS_SLOWLOCKED;
- client->ps.stats[ STAT_BOOSTTIME ] = level.time - client->lastBoostedTime;
-
if( client->ps.stats[ STAT_STATE ] & SS_BOOSTED &&
client->lastBoostedTime + BOOST_TIME < level.time )
client->ps.stats[ STAT_STATE ] &= ~SS_BOOSTED;