X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=06a59fb96a52a3bd2a6f6a4b96124b59412c2e0d;hb=4a34d824c925ea0766c7ffa9355a3de026e57672;hp=48477c79c92907ff1c43c2f9d06c6577a25331ea;hpb=9bd0be2befdf81aa4b5d377eaf29656935044faf;p=lugaru.git diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index 48477c7..06a59fb 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -2682,7 +2682,7 @@ void doAerialAcrobatics() if (Person::players[k]->animTarget == jumpdownanim || Person::players[k]->isFlip()) { //flipped into a rock - if (Person::players[k]->isFlip() && Animation::animations[Person::players[k]->animTarget].frames[Person::players[k]->frameTarget].label == 7) + if (Person::players[k]->isFlip() && Person::players[k]->targetFrame().label == 7) Person::players[k]->RagDoll(0); if (Person::players[k]->animTarget == jumpupanim) { @@ -2987,8 +2987,7 @@ void doAttacks() Person::players[k]->animTarget != rabbitkickanim && Person::players[i]->animTarget != getupfrombackanim && (Person::players[i]->animTarget != staggerbackhighanim && - (Person::players[i]->animTarget != staggerbackhardanim || - Animation::animations[staggerbackhardanim].frames[Person::players[i]->frameTarget].label == 6)) && + (Person::players[i]->animTarget != staggerbackhardanim || Person::players[i]->targetFrame().label == 6)) && Person::players[i]->animTarget != jumpdownanim && Person::players[i]->animTarget != jumpupanim && Person::players[i]->animTarget != getupfromfrontanim) {