diff options
| author | Tim Angus <tim@ngus.net> | 2004-01-16 23:24:49 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2004-01-16 23:24:49 +0000 |
| commit | 73d22e1004003af65b2e1adba19649bb9933a42e (patch) | |
| tree | 897f903f75e1b19c9796c99e826e15348e1d2511 /src/cgame | |
| parent | bdea2382a6a305a168300cfd42ee1ab0a3e8e048 (diff) | |
* Fixed absence of weapon flash effects with no flash model
* Adjusted chimera repeat rates a little
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_weapons.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index cdd77d47..fbb79c08 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -1116,20 +1116,20 @@ void CG_AddPlayerWeapon( refEntity_t *parent, playerState_t *ps, centity_t *cent flash.renderfx = parent->renderfx; flash.hModel = weapon->flashModel; - if( !flash.hModel ) - return; - - angles[ YAW ] = 0; - angles[ PITCH ] = 0; - angles[ ROLL ] = crandom( ) * 10; - AnglesToAxis( angles, flash.axis ); + if( flash.hModel ) + { + angles[ YAW ] = 0; + angles[ PITCH ] = 0; + angles[ ROLL ] = crandom( ) * 10; + AnglesToAxis( angles, flash.axis ); - if( noGunModel ) - CG_PositionRotatedEntityOnTag( &flash, parent, parent->hModel, "tag_weapon" ); - else - CG_PositionRotatedEntityOnTag( &flash, &gun, weapon->weaponModel, "tag_flash" ); - - trap_R_AddRefEntityToScene( &flash ); + if( noGunModel ) + CG_PositionRotatedEntityOnTag( &flash, parent, parent->hModel, "tag_weapon" ); + else + CG_PositionRotatedEntityOnTag( &flash, &gun, weapon->weaponModel, "tag_flash" ); + + trap_R_AddRefEntityToScene( &flash ); + } if( ps || cg.renderingThirdPerson || cent->currentState.number != cg.predictedPlayerState.clientNum ) |