rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-14 08:50:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

I tabbed a function properly. It was pissing me off

Browse source
This commit is contained in:
Bryce Hutchings 2002-03-16 21:50:49 +00:00
parent 30d61a8c7c
commit 5b46b3ee70
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reaction/cgame/cg_ents.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.19 2002/03/16 21:50:49 niceass
// I tabbed a function properly. It was pissing me off
//
// Revision 1.18 2002/01/14 01:19:23 niceass // Revision 1.18 2002/01/14 01:19:23 niceass
// No more default 800 gravity on items - NiceAss // No more default 800 gravity on items - NiceAss
// //
@ -61,22 +64,22 @@ Changed from CG_PositionEntityOnTag function to prevent backlerp change in anima
====================== ======================
*/ */
void CG_PositionWeaponOnTag( refEntity_t *entity, const refEntity_t *parent, qhandle_t parentModel, char *tagName ) { void CG_PositionWeaponOnTag( refEntity_t *entity, const refEntity_t *parent, qhandle_t parentModel, char *tagName ) {
int i; int i;
orientation_t lerped; orientation_t lerped;
// lerp the tag // lerp the tag
trap_R_LerpTag( &lerped, parentModel, parent->oldframe, parent->frame, trap_R_LerpTag( &lerped, parentModel, parent->oldframe, parent->frame,
1.0 - parent->backlerp, tagName ); 1.0 - parent->backlerp, tagName );
// FIXME: allow origin offsets along tag? // FIXME: allow origin offsets along tag?
VectorCopy( parent->origin, entity->origin ); VectorCopy( parent->origin, entity->origin );
for ( i = 0 ; i < 3 ; i++ ) { for ( i = 0 ; i < 3 ; i++ ) {
VectorMA( entity->origin, lerped.origin[i], parent->axis[i], entity->origin ); VectorMA( entity->origin, lerped.origin[i], parent->axis[i], entity->origin );
} }
// had to cast away the const to avoid compiler problems... // had to cast away the const to avoid compiler problems...
MatrixMultiply( lerped.axis, ((refEntity_t *)parent)->axis, entity->axis ); MatrixMultiply( lerped.axis, ((refEntity_t *)parent)->axis, entity->axis );
// entity->backlerp = parent->backlerp; // entity->backlerp = parent->backlerp;
} }
@ -112,7 +115,6 @@ void CG_PositionRotatedEntityOnTag( refEntity_t *entity, const refEntity_t *pare
} }
/* /*
========================================================================== ==========================================================================