diff --git a/src/actions.cc b/src/actions.cc index ffff2b6..292e5ce 100644 --- a/src/actions.cc +++ b/src/actions.cc @@ -529,7 +529,7 @@ void _show_damage(Attack* attack, int attackerAnimation, int delay) for (int index = 0; index < attack->extrasLength; index++) { Object* object = attack->extras[index]; if (FID_TYPE(object->fid) == OBJ_TYPE_CRITTER) { - reg_anim_26(ANIMATION_REQUEST_RESERVED, delay); + animationRegisterPing(ANIMATION_REQUEST_RESERVED, delay); delay = 0; } } diff --git a/src/animation.cc b/src/animation.cc index 49b725b..e446bf7 100644 --- a/src/animation.cc +++ b/src/animation.cc @@ -67,7 +67,7 @@ typedef enum AnimationKind { ANIM_KIND_CHECK_FALLING = 23, ANIM_KIND_TOGGLE_OUTLINE = 24, ANIM_KIND_ANIMATE_FOREVER = 25, - ANIM_KIND_26 = 26, + ANIM_KIND_PING = 26, ANIM_KIND_27 = 27, ANIM_KIND_NOOP = 28, @@ -411,7 +411,7 @@ static int _anim_free_slot(int requestOptions) if (!(animationSequence->flags & ANIM_SEQ_RESERVED)) { v2++; } - } else if (v1 == -1 && ((requestOptions & ANIMATION_REQUEST_0x100) == 0 || (animationSequence->flags & ANIM_SEQ_0x10) == 0)) { + } else if (v1 == -1 && ((requestOptions & ANIMATION_REQUEST_PING) == 0 || (animationSequence->flags & ANIM_SEQ_0x10) == 0)) { v1 = index; } } @@ -1331,14 +1331,14 @@ int animationRegisterAnimateForever(Object* owner, int anim, int delay) } // 0x415598 -int reg_anim_26(int a1, int delay) +int animationRegisterPing(int flags, int delay) { if (_check_registry(NULL) == -1) { _anim_cleanup(); return -1; } - int animationSequenceIndex = _anim_free_slot(a1 | ANIMATION_REQUEST_0x100); + int animationSequenceIndex = _anim_free_slot(flags | ANIMATION_REQUEST_PING); if (animationSequenceIndex == -1) { return -1; } @@ -1348,7 +1348,7 @@ int reg_anim_26(int a1, int delay) AnimationSequence* animationSequence = &(gAnimationSequences[gAnimationSequenceCurrentIndex]); AnimationDescription* animationDescription = &(animationSequence->animations[gAnimationDescriptionCurrentIndex]); animationDescription->owner = NULL; - animationDescription->kind = ANIM_KIND_26; + animationDescription->kind = ANIM_KIND_PING; animationDescription->artCacheKey = NULL; animationDescription->animationSequenceIndex = animationSequenceIndex; animationDescription->delay = delay; @@ -1520,7 +1520,7 @@ static int animationRunSequence(int animationSequenceIndex) } rc = _anim_set_continue(animationSequenceIndex, 0); break; - case ANIM_KIND_26: + case ANIM_KIND_PING: gAnimationSequences[animationDescription->animationSequenceIndex].flags &= ~ANIM_SEQ_0x10; rc = _anim_set_continue(animationDescription->animationSequenceIndex, 1); if (rc != -1) { @@ -1610,7 +1610,7 @@ static int _anim_set_end(int animationSequenceIndex) if (animationDescription->kind != 11 && animationDescription->kind != 12) { // TODO: Check. - if (animationDescription->kind != ANIM_KIND_26) { + if (animationDescription->kind != ANIM_KIND_PING) { Object* owner = animationDescription->owner; if (FID_TYPE(owner->fid) == OBJ_TYPE_CRITTER) { int j = 0; diff --git a/src/animation.h b/src/animation.h index 68625bd..c4d89d9 100644 --- a/src/animation.h +++ b/src/animation.h @@ -10,7 +10,7 @@ typedef enum AnimationRequestOptions { ANIMATION_REQUEST_UNRESERVED = 0x01, ANIMATION_REQUEST_RESERVED = 0x02, ANIMATION_REQUEST_NO_STAND = 0x04, - ANIMATION_REQUEST_0x100 = 0x100, + ANIMATION_REQUEST_PING = 0x100, ANIMATION_REQUEST_INSIGNIFICANT = 0x200, } AnimationRequestOptions; @@ -142,7 +142,7 @@ int animationRegisterSetLightDistance(Object* owner, int lightDistance, int dela int animationRegisterToggleOutline(Object* object, bool outline, int delay); int animationRegisterPlaySoundEffect(Object* owner, const char* soundEffectName, int delay); int animationRegisterAnimateForever(Object* owner, int anim, int delay); -int reg_anim_26(int a1, int a2); +int animationRegisterPing(int flags, int delay); int _make_path(Object* object, int from, int to, unsigned char* a4, int a5); int pathfinderFindPath(Object* object, int from, int to, unsigned char* rotations, int a5, PathBuilderCallback* callback); int _make_straight_path(Object* a1, int from, int to, STRUCT_530014_28* pathNodes, Object** a5, int a6);