Skip to content

Commit

Permalink
fix crash that didn't exist when i pushed this feature
Browse files Browse the repository at this point in the history
  • Loading branch information
Bucky21659 committed May 17, 2020
1 parent 7dc6017 commit 77becb7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions codemp/game/bg_panimate.c
Original file line number Diff line number Diff line change
Expand Up @@ -2694,7 +2694,7 @@ void PM_SetTorsoAnimTimer(int time )

void BG_SaberStartTransAnim( int clientNum, int saberAnimLevel, int weapon, int anim, float *animSpeed, int broken )
{
if (JK2SWINGS(pm->ps)) {
if (pm && JK2SWINGS(pm->ps)) {
if (((anim) >= BOTH_T1_BR__R && (anim) <= BOTH_T1_BL_TL) ||
((anim) >= BOTH_T2_BR__R && (anim) <= BOTH_T2_BL_TL) ||
((anim) >= BOTH_T3_BR__R && (anim) <= BOTH_T3_BL_TL))
Expand Down Expand Up @@ -2831,9 +2831,9 @@ void BG_SetAnimFinal(playerState_t *ps, animation_t *animations,
ps->torsoTimer /= 1.7;
}

if (JK2SWINGS(pm->ps) && editAnimSpeed)
if (JK2SWINGS(ps) && editAnimSpeed)
{
pm->ps->torsoTimer /= editAnimSpeed;
ps->torsoTimer /= editAnimSpeed;
}
}
}
Expand Down

0 comments on commit 77becb7

Please sign in to comment.