diff options
| author | Tim Angus <tim@ngus.net> | 2001-08-21 22:52:16 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2001-08-21 22:52:16 +0000 |
| commit | 3cd412949b4cc08e83ffde2ac9cdfd506330b21b (patch) | |
| tree | 2792859b89b11ad4b3f5978d1855d5ba6aa2eed9 /src | |
| parent | a30920331b968eff36a90289d420ac7eead5013d (diff) | |
Cleanups to cg_buildable.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_buildable.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c index 097dea43..7e8ed9c8 100644 --- a/src/cgame/cg_buildable.c +++ b/src/cgame/cg_buildable.c @@ -111,10 +111,10 @@ static qboolean CG_ParseBuildableAnimationFile( const char *filename, buildable_ animations[ i ].initialLerp = 1000 / fps; } -/* if ( i != MAX_BUILDABLE_ANIMATIONS ) { + if ( i != MAX_BUILDABLE_ANIMATIONS ) { CG_Printf( "Error parsing animation file: %s", filename ); return qfalse; - }*/ + } return qtrue; } @@ -297,10 +297,6 @@ void CG_Buildable( centity_t *cent ) refEntity_t ent; refEntity_t ent2; entityState_t *es; - gitem_t *item; - int msec; - float frac; - float scale; es = ¢->currentState; if ( es->modelindex >= bg_numItems ) @@ -314,8 +310,6 @@ void CG_Buildable( centity_t *cent ) if ( !es->modelindex || ( es->eFlags & EF_NODRAW ) ) return; - item = &bg_itemlist[ es->modelindex ]; - memset ( &ent, 0, sizeof( ent ) ); VectorCopy( es->angles, cent->lerpAngles ); @@ -328,18 +322,7 @@ void CG_Buildable( centity_t *cent ) ent.nonNormalizedAxes = qfalse; - // if just respawned, slowly scale up -/* msec = cg.time - cent->miscTime; - if ( msec >= 0 && msec < ITEM_SCALEUP_TIME ) { - frac = (float)msec / ITEM_SCALEUP_TIME; - VectorScale( ent.axis[0], frac, ent.axis[0] ); - VectorScale( ent.axis[1], frac, ent.axis[1] ); - VectorScale( ent.axis[2], frac, ent.axis[2] ); - ent.nonNormalizedAxes = qtrue; - } else { - frac = 1.0; - }*/ - + //run animations CG_BuildableAnimation( cent, &ent.oldframe, &ent.frame, &ent.backlerp ); //turret barrel bit |