summaryrefslogtreecommitdiff
path: root/src/game/g_active.c
diff options
context:
space:
mode:
authorPaweł Redman <trem.redman@gmail.com>2013-09-09 00:42:43 +0200
committerPaweł Redman <trem.redman@gmail.com>2013-09-09 00:42:43 +0200
commit27a16fb1fa69d458fb10e6437eb07b85496b46b8 (patch)
tree70a520565f85e5b9c85cabcf7bc1024badc184af /src/game/g_active.c
parent5b6289ef53d06d005e94b20b3d45f7726588de99 (diff)
0.1.2 and code cleanup
Diffstat (limited to 'src/game/g_active.c')
-rw-r--r--src/game/g_active.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c
index a65d9f2..42e8199 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -747,12 +747,13 @@ void ClientTimerActions( gentity_t *ent, int msec )
ent->health < ent->client->ps.stats[ STAT_MAX_HEALTH ] )
{
float hp, dmod;
-
- dmod = MIN( level.time - ent->lastDamageTime, 3000 ) / 3000.0f;
+
+ dmod = MAX( MIN( level.time - ent->lastDamageTime - 2000, 3000 ) / 3000.0f, 0 );
+
hp = (float)ent->health / ent->client->ps.stats[ STAT_MAX_HEALTH ];
ent->client->bioresHealTimer += (BIORES_EQUATION) * 10 * dmod;
}
-
+
if( ent->client->bioresHealTimer >= 100 )
{
int delta;