diff options
| author | Tim Angus <tim@ngus.net> | 2005-11-27 00:00:16 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2005-11-27 00:00:16 +0000 |
| commit | 046697c4b9369c02e730f1e16617e09876619864 (patch) | |
| tree | 738d39079d13eb84b4d932f2a032e61cae570dbd /src/cgame/cg_players.c | |
| parent | 3460e8bf9381c61e1bef98b78d320a8bd52b7f5f (diff) | |
* Fixed death by poison MOD s/antitox/medkit/
* Fixed Marauders momentarily disappearing when wall jumping
* Fixed a potential crash bug involving the use of generic1
* Fixed being able to build multiple coincident repeaters if there is no reactor
* Fixed incorrect message when invoking "buy ammo" with an energy weapon and no reactor present
* Fixed invoking "reload" during a weapon reload causing an unnecessary reload
* Fixed aliens having the wrong blood colour when shot with a las gun
* Fixed hovel causing invisible builders
Diffstat (limited to 'src/cgame/cg_players.c')
| -rw-r--r-- | src/cgame/cg_players.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c index d1a361d8..fd186145 100644 --- a/src/cgame/cg_players.c +++ b/src/cgame/cg_players.c @@ -1351,7 +1351,9 @@ static void CG_PlayerWWSmoothing( centity_t *cent, vec3_t in[ 3 ], vec3_t out[ 3 vec3_t inAxis[ 3 ], lastAxis[ 3 ], outAxis[ 3 ]; //set surfNormal - if( !( es->eFlags & EF_WALLCLIMBCEILING ) ) + if( !(es->eFlags & EF_WALLCLIMB ) ) + VectorCopy( refNormal, surfNormal ); + else if( !( es->eFlags & EF_WALLCLIMBCEILING ) ) VectorCopy( es->angles2, surfNormal ); else VectorCopy( ceilingNormal, surfNormal ); @@ -2274,10 +2276,13 @@ void CG_Player( centity_t *cent ) // // add the gun / barrel / flash // - if( !ci->nonsegmented ) - CG_AddPlayerWeapon( &torso, NULL, cent ); - else - CG_AddPlayerWeapon( &legs, NULL, cent ); + if( es->weapon != WP_NONE ) + { + if( !ci->nonsegmented ) + CG_AddPlayerWeapon( &torso, NULL, cent ); + else + CG_AddPlayerWeapon( &legs, NULL, cent ); + } CG_PlayerUpgrades( cent, &torso ); |