eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename animationRegisterPing

This commit is contained in:
Alexander Batalov 2022-12-23 15:22:53 +03:00
parent f4775775b8
commit 9a6d45541f
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions.cc
View File

@ -529,7 +529,7 @@ void _show_damage(Attack* attack, int attackerAnimation, int delay)
for (int index = 0; index < attack->extrasLength; index++) { for (int index = 0; index < attack->extrasLength; index++) {
Object* object = attack->extras[index]; Object* object = attack->extras[index];
if (FID_TYPE(object->fid) == OBJ_TYPE_CRITTER) { if (FID_TYPE(object->fid) == OBJ_TYPE_CRITTER) {
reg_anim_26(ANIMATION_REQUEST_RESERVED, delay); animationRegisterPing(ANIMATION_REQUEST_RESERVED, delay);
delay = 0; delay = 0;
} }
} }

14
src/animation.cc
View File

@ -67,7 +67,7 @@ typedef enum AnimationKind {
ANIM_KIND_CHECK_FALLING = 23, ANIM_KIND_CHECK_FALLING = 23,
ANIM_KIND_TOGGLE_OUTLINE = 24, ANIM_KIND_TOGGLE_OUTLINE = 24,
ANIM_KIND_ANIMATE_FOREVER = 25, ANIM_KIND_ANIMATE_FOREVER = 25,
ANIM_KIND_26 = 26, ANIM_KIND_PING = 26,
ANIM_KIND_27 = 27, ANIM_KIND_27 = 27,
ANIM_KIND_NOOP = 28, ANIM_KIND_NOOP = 28,
@ -411,7 +411,7 @@ static int _anim_free_slot(int requestOptions)
if (!(animationSequence->flags & ANIM_SEQ_RESERVED)) { if (!(animationSequence->flags & ANIM_SEQ_RESERVED)) {
v2++; 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; v1 = index;
} }
} }
@ -1331,14 +1331,14 @@ int animationRegisterAnimateForever(Object* owner, int anim, int delay)
} }
// 0x415598 // 0x415598
int reg_anim_26(int a1, int delay) int animationRegisterPing(int flags, int delay)
{ {
if (_check_registry(NULL) == -1) { if (_check_registry(NULL) == -1) {
_anim_cleanup(); _anim_cleanup();
return -1; return -1;
} }
int animationSequenceIndex = _anim_free_slot(a1 | ANIMATION_REQUEST_0x100); int animationSequenceIndex = _anim_free_slot(flags | ANIMATION_REQUEST_PING);
if (animationSequenceIndex == -1) { if (animationSequenceIndex == -1) {
return -1; return -1;
} }
@ -1348,7 +1348,7 @@ int reg_anim_26(int a1, int delay)
AnimationSequence* animationSequence = &(gAnimationSequences[gAnimationSequenceCurrentIndex]); AnimationSequence* animationSequence = &(gAnimationSequences[gAnimationSequenceCurrentIndex]);
AnimationDescription* animationDescription = &(animationSequence->animations[gAnimationDescriptionCurrentIndex]); AnimationDescription* animationDescription = &(animationSequence->animations[gAnimationDescriptionCurrentIndex]);
animationDescription->owner = NULL; animationDescription->owner = NULL;
animationDescription->kind = ANIM_KIND_26; animationDescription->kind = ANIM_KIND_PING;
animationDescription->artCacheKey = NULL; animationDescription->artCacheKey = NULL;
animationDescription->animationSequenceIndex = animationSequenceIndex; animationDescription->animationSequenceIndex = animationSequenceIndex;
animationDescription->delay = delay; animationDescription->delay = delay;
@ -1520,7 +1520,7 @@ static int animationRunSequence(int animationSequenceIndex)
} }
rc = _anim_set_continue(animationSequenceIndex, 0); rc = _anim_set_continue(animationSequenceIndex, 0);
break; break;
case ANIM_KIND_26: case ANIM_KIND_PING:
gAnimationSequences[animationDescription->animationSequenceIndex].flags &= ~ANIM_SEQ_0x10; gAnimationSequences[animationDescription->animationSequenceIndex].flags &= ~ANIM_SEQ_0x10;
rc = _anim_set_continue(animationDescription->animationSequenceIndex, 1); rc = _anim_set_continue(animationDescription->animationSequenceIndex, 1);
if (rc != -1) { if (rc != -1) {
@ -1610,7 +1610,7 @@ static int _anim_set_end(int animationSequenceIndex)
if (animationDescription->kind != 11 && animationDescription->kind != 12) { if (animationDescription->kind != 11 && animationDescription->kind != 12) {
// TODO: Check. // TODO: Check.
if (animationDescription->kind != ANIM_KIND_26) { if (animationDescription->kind != ANIM_KIND_PING) {
Object* owner = animationDescription->owner; Object* owner = animationDescription->owner;
if (FID_TYPE(owner->fid) == OBJ_TYPE_CRITTER) { if (FID_TYPE(owner->fid) == OBJ_TYPE_CRITTER) {
int j = 0; int j = 0;

4
src/animation.h
View File

@ -10,7 +10,7 @@ typedef enum AnimationRequestOptions {
ANIMATION_REQUEST_UNRESERVED = 0x01, ANIMATION_REQUEST_UNRESERVED = 0x01,
ANIMATION_REQUEST_RESERVED = 0x02, ANIMATION_REQUEST_RESERVED = 0x02,
ANIMATION_REQUEST_NO_STAND = 0x04, ANIMATION_REQUEST_NO_STAND = 0x04,
ANIMATION_REQUEST_0x100 = 0x100, ANIMATION_REQUEST_PING = 0x100,
ANIMATION_REQUEST_INSIGNIFICANT = 0x200, ANIMATION_REQUEST_INSIGNIFICANT = 0x200,
} AnimationRequestOptions; } AnimationRequestOptions;
@ -142,7 +142,7 @@ int animationRegisterSetLightDistance(Object* owner, int lightDistance, int dela
int animationRegisterToggleOutline(Object* object, bool outline, int delay); int animationRegisterToggleOutline(Object* object, bool outline, int delay);
int animationRegisterPlaySoundEffect(Object* owner, const char* soundEffectName, int delay); int animationRegisterPlaySoundEffect(Object* owner, const char* soundEffectName, int delay);
int animationRegisterAnimateForever(Object* owner, int anim, 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 _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 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); int _make_straight_path(Object* a1, int from, int to, STRUCT_530014_28* pathNodes, Object** a5, int a6);