From b0561e5fb4c330fd10ce87cb71ebcc1fd3b32343 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Wed, 10 Dec 2014 18:50:22 -0600 Subject: [PATCH] Fix weapon barrel angle on Gauntlet and BFG items in Team Arena The barrels were rotated 90 degrees from what they should be. Used barrel code from CG_AddPlayerWeapon to fix them. --- code/cgame/cg_ents.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/cgame/cg_ents.c b/code/cgame/cg_ents.c index 356196e8..90cd1ae0 100644 --- a/code/cgame/cg_ents.c +++ b/code/cgame/cg_ents.c @@ -352,6 +352,7 @@ static void CG_Item( centity_t *cent ) { #ifdef MISSIONPACK if ( item->giType == IT_WEAPON && wi && wi->barrelModel ) { refEntity_t barrel; + vec3_t angles; memset( &barrel, 0, sizeof( barrel ) ); @@ -361,9 +362,13 @@ static void CG_Item( centity_t *cent ) { barrel.shadowPlane = ent.shadowPlane; barrel.renderfx = ent.renderfx; + angles[YAW] = 0; + angles[PITCH] = 0; + angles[ROLL] = 0; + AnglesToAxis( angles, barrel.axis ); + CG_PositionRotatedEntityOnTag( &barrel, &ent, wi->weaponModel, "tag_barrel" ); - AxisCopy( ent.axis, barrel.axis ); barrel.nonNormalizedAxes = ent.nonNormalizedAxes; trap_R_AddRefEntityToScene( &barrel );