diff options
author | Tim Angus <tim@ngus.net> | 2004-01-15 03:14:16 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2004-01-15 03:14:16 +0000 |
commit | 847db87d7a1be6425646a59fe583134ffb513510 (patch) | |
tree | f4589b50a7195bb1ce24a5cdf2bd3be4d81d29a3 /src/game/g_active.c | |
parent | c61e168ffb6e3ad28ac7e126ba9ff076984daa27 (diff) |
* Fixed physics bug where movers would displace buildables
* Light flares are now occluded by the player in 3rd person mode
* Setting s_initsound 0 no longer causes the weapon.cfg loader to complain
* Limited viewangles to +/-90 degrees when grabbed
Diffstat (limited to 'src/game/g_active.c')
-rw-r--r-- | src/game/g_active.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 21ff144e..90136f11 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -496,7 +496,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) if( client->ps.weapon == WP_BIGMOFO ) { if( client->ps.stats[ STAT_MISC ] < BMOFO_CHARGE_TIME && ucmd->buttons & BUTTON_ATTACK2 && - ( ucmd->forwardmove > 0 || aRight ) ) + ( ucmd->forwardmove > 0 ) ) { client->charging = qfalse; //should already be off, just making sure @@ -514,7 +514,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) client->charging = qtrue; //if the charger has stopped moving take a chunk of charge away - if( VectorLength( client->ps.velocity ) < 64.0f ) + if( VectorLength( client->ps.velocity ) < 64.0f || aRight ) client->ps.stats[ STAT_MISC ] = client->ps.stats[ STAT_MISC ] >> 1; //can't charge backwards |