diff options
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_players.c | 10 | ||||
| -rw-r--r-- | src/cgame/cg_view.c | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c index dd62695a..5357b589 100644 --- a/src/cgame/cg_players.c +++ b/src/cgame/cg_players.c @@ -2066,6 +2066,16 @@ void CG_Player( centity_t *cent ) CG_AddPlayerWeapon( &torso, NULL, cent ); CG_PlayerUpgrades( cent, &torso ); + + //sanity check that particle systems are stopped when dead + if( es->eFlags & EF_DEAD ) + { + if( cent->muzzlePS != NULL ) + CG_DestroyParticleSystem( cent->muzzlePS ); + + if( cent->jetPackPS != NULL ) + CG_DestroyParticleSystem( cent->jetPackPS ); + } } /* diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c index 1099b7a5..70e4f900 100644 --- a/src/cgame/cg_view.c +++ b/src/cgame/cg_view.c @@ -462,7 +462,7 @@ static void CG_OffsetFirstPersonView( void ) bob2 = BG_FindBobForClass( cg.predictedPlayerState.stats[ STAT_PCLASS ] ); //give a charging player some feedback - if( cg.predictedPlayerState.weapon == WP_CHARGE ) + if( cg.predictedPlayerState.weapon == WP_BIGMOFO ) { if( cg.predictedPlayerState.stats[ STAT_MISC ] > 0 ) { @@ -496,8 +496,8 @@ static void CG_OffsetFirstPersonView( void ) } //provide some feedback for pouncing - if( cg.predictedPlayerState.weapon == WP_POUNCE || - cg.predictedPlayerState.weapon == WP_POUNCE_UPG ) + if( cg.predictedPlayerState.weapon == WP_DRAGOON || + cg.predictedPlayerState.weapon == WP_DRAGOON_UPG ) { if( cg.predictedPlayerState.stats[ STAT_MISC ] > 0 ) { |