summaryrefslogtreecommitdiff
path: root/src/game/bg_pmove.c
diff options
context:
space:
mode:
authorRoman Tetelman <kevlarman@gmail.com>2009-10-03 11:53:33 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:15:29 +0000
commit3cdc6d312f559318dee729d4ee827b8e02d1a4b9 (patch)
tree074cc2c20269cc6b19a40025179d1acdad07ee02 /src/game/bg_pmove.c
parent29a8cd9836dd913ca71b696b9ae4fb58f7717052 (diff)
* trample stops after LEVEL4_TRAMPLE_DURATION - LEVEL4_TRAMPLE_CHARGE_MIN because it's not particularly useful after that point
Diffstat (limited to 'src/game/bg_pmove.c')
-rw-r--r--src/game/bg_pmove.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 278aab21..a70ef001 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2905,8 +2905,11 @@ static void PM_Weapon( void )
// Discharging
else
{
- pm->ps->stats[ STAT_MISC ] -= pml.msec;
-
+ if( pm->ps->stats[ STAT_MISC ] < LEVEL4_TRAMPLE_CHARGE_MIN )
+ pm->ps->stats[ STAT_MISC ] = 0;
+ else
+ pm->ps->stats[ STAT_MISC ] -= pml.msec;
+
// If the charger has stopped moving take a chunk of charge away
if( VectorLength( pm->ps->velocity ) < 64.0f || pm->cmd.rightmove )
pm->ps->stats[ STAT_MISC ] -= LEVEL4_TRAMPLE_STOP_PENALTY * pml.msec;