Changeset 174:b994a2789d5f

Timestamp:

05/18/08 23:38:09 (2 years ago)

Author:

mdoison@…

Branch:

default

Message:

• Fix ticket #153 : assert fails in qcommon/msg.c:883

Location:

src

Files:

• cgame/cg_weapons.c (modified) (2 diffs)
• game/bg_misc.c (modified) (2 diffs)
• game/bg_pmove.c (modified) (14 diffs)
• qcommon/q_shared.h (modified) (2 diffs)

src/cgame/cg_weapons.c

@@ -759 +759 @@
 
 /*
-===============
-CG_SetWeaponLerpFrameAnimation
-
-may include ANIM_TOGGLEBIT
-===============
-*/
-static void CG_SetWeaponLerpFrameAnimation( weapon_t weapon, lerpFrame_t *lf, int newAnimation )
-{
-  animation_t *anim;
-
-  lf->animationNumber = newAnimation;
-  newAnimation &= ~ANIM_TOGGLEBIT;
-
-  if( newAnimation < 0 || newAnimation >= MAX_WEAPON_ANIMATIONS )
-    CG_Error( "Bad animation number: %i", newAnimation );
-
-  anim = &cg_weapons[ weapon ].animations[ newAnimation ];
-
-  lf->animation = anim;
-  lf->animationTime = lf->frameTime + anim->initialLerp;
-
-  if( cg_debugAnim.integer )
-    CG_Printf( "Anim: %i\n", newAnimation );
-}
-
-/*
-===============
-CG_WeaponAnimation
-===============
-*/
-static void CG_WeaponAnimation( centity_t *cent, int *old, int *now, float *backLerp )
-{
-  lerpFrame_t   *lf = &cent->pe.weapon;
-  entityState_t *es = &cent->currentState;
-
-  // see if the animation sequence is switching
-  if( es->weaponAnim != lf->animationNumber || !lf->animation )
-    CG_SetWeaponLerpFrameAnimation( es->weapon, lf, es->weaponAnim );
-
-  CG_RunLerpFrame( lf, 1.0f );
-
-  *old      = lf->oldFrame;
-  *now      = lf->frame;
-  *backLerp = lf->backlerp;
-}
-
-/*
 =================
 CG_MapTorsoToWeaponFrame
@@ -1013 +966 @@
   {
     CG_PositionEntityOnTag( &gun, parent, parent->hModel, "tag_weapon" );
-    CG_WeaponAnimation( cent, &gun.oldframe, &gun.frame, &gun.backlerp );
 
     trap_R_AddRefEntityToScene( &gun );

src/game/bg_misc.c

@@ -2900 +2900 @@
   s->legsAnim = ps->legsAnim;
   s->torsoAnim = ps->torsoAnim;
-  s->weaponAnim = ps->weaponAnim;
   s->clientNum = ps->clientNum;   // ET_PLAYER looks here instead of at number
                     // so corpses can also reference the proper config
@@ -3009 +3008 @@
   s->legsAnim = ps->legsAnim;
   s->torsoAnim = ps->torsoAnim;
-  s->weaponAnim = ps->weaponAnim;
   s->clientNum = ps->clientNum;   // ET_PLAYER looks here instead of at number
                     // so corpses can also reference the proper config

src/game/bg_pmove.c

@@ -104 +104 @@
 /*
 ===================
-PM_StartWeaponAnim
-===================
-*/
-static void PM_StartWeaponAnim( int anim )
-{
-  if( pm->ps->pm_type >= PM_DEAD )
-    return;
-
-  pm->ps->weaponAnim = ( ( pm->ps->weaponAnim & ANIM_TOGGLEBIT ) ^ ANIM_TOGGLEBIT )
-    | anim;
-}
-
-/*
-===================
 PM_StartLegsAnim
 ===================
@@ -181 +167 @@
 
   PM_StartTorsoAnim( anim );
-}
-
-/*
-===================
-PM_ContinueWeaponAnim
-===================
-*/
-static void PM_ContinueWeaponAnim( int anim )
-{
-  if( ( pm->ps->weaponAnim & ~ANIM_TOGGLEBIT ) == anim )
-    return;
-
-  PM_StartWeaponAnim( anim );
 }
 
@@ -2649 +2622 @@
   {
     PM_StartTorsoAnim( TORSO_DROP );
-    PM_StartWeaponAnim( WANIM_DROP );
   }
 }
@@ -2677 +2649 @@
   {
     PM_StartTorsoAnim( TORSO_RAISE );
-    PM_StartWeaponAnim( WANIM_RAISE );
   }
 }
@@ -2699 +2670 @@
         PM_ContinueTorsoAnim( TORSO_STAND );
     }
-
-    PM_ContinueWeaponAnim( WANIM_IDLE );
   }
 }
@@ -2816 +2785 @@
     }
 
-    PM_ContinueWeaponAnim( WANIM_IDLE );
-
     return;
   }
@@ -2868 +2835 @@
     //drop the weapon
     PM_StartTorsoAnim( TORSO_DROP );
-    PM_StartWeaponAnim( WANIM_RELOAD );
 
     addTime = BG_Weapon( pm->ps->weapon )->reloadTime;
@@ -3044 +3010 @@
         {
           PM_StartTorsoAnim( TORSO_ATTACK );
-          PM_StartWeaponAnim( WANIM_ATTACK1 );
         }
         break;
@@ -3050 +3015 @@
       case WP_BLASTER:
         PM_StartTorsoAnim( TORSO_ATTACK2 );
-        PM_StartWeaponAnim( WANIM_ATTACK1 );
         break;
 
       default:
         PM_StartTorsoAnim( TORSO_ATTACK );
-        PM_StartWeaponAnim( WANIM_ATTACK1 );
         break;
     }
@@ -3073 +3036 @@
           num %= 6;
           PM_ForceLegsAnim( NSPA_ATTACK1 );
-          PM_StartWeaponAnim( WANIM_ATTACK1 + num );
         }
         break;
@@ -3081 +3043 @@
         {
           PM_ForceLegsAnim( NSPA_ATTACK2 );
-          PM_StartWeaponAnim( WANIM_ATTACK7 );
         }
       case WP_ALEVEL2:
@@ -3088 +3049 @@
           num %= 6;
           PM_ForceLegsAnim( NSPA_ATTACK1 );
-          PM_StartWeaponAnim( WANIM_ATTACK1 + num );
         }
         break;
@@ -3095 +3055 @@
         num %= 3;
         PM_ForceLegsAnim( NSPA_ATTACK1 + num );
-        PM_StartWeaponAnim( WANIM_ATTACK1 + num );
         break;
 
@@ -3102 +3061 @@
         {
           PM_ForceLegsAnim( NSPA_ATTACK1 );
-          PM_StartWeaponAnim( WANIM_ATTACK1 );
         }
         else if( attack2 )
         {
           PM_ForceLegsAnim( NSPA_ATTACK2 );
-          PM_StartWeaponAnim( WANIM_ATTACK2 );
         }
         else if( attack3 )
         {
           PM_ForceLegsAnim( NSPA_ATTACK3 );
-          PM_StartWeaponAnim( WANIM_ATTACK3 );
         }
         break;

src/qcommon/q_shared.h

@@ -1060 +1060 @@
         int                     torsoAnim;              // mask off ANIM_TOGGLEBIT
 
-        int                     weaponAnim;             // mask off ANIM_TOGGLEBIT
-
         int                     movementDir;    // a number 0 to 7 that represents the reletive angle
                                                                 // of movement to the view angle (axial and diagonals)
@@ -1217 +1215 @@
         int             legsAnim;               // mask off ANIM_TOGGLEBIT
         int             torsoAnim;              // mask off ANIM_TOGGLEBIT
-        int             weaponAnim;             // mask off ANIM_TOGGLEBIT
 
         int             generic1;