diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2025-06-20 10:12:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-20 10:12:45 +0200 |
| commit | 04a92708cf6d78e0f2dc72c50948eaa2872d7d5e (patch) | |
| tree | 1f61ef9b8ab69e2d5ff0592e94a75eb6bf432bfc /src/code/z_collision_check.c | |
| parent | b11fdab792f1e7c4b71cfa7568963fad1c7d742d (diff) | |
Rename AT `effect` to `hitSpecialEffect` (#2637)
* Rename AT `effect` to `hitSpecialEffect`
* bss
Diffstat (limited to 'src/code/z_collision_check.c')
| -rw-r--r-- | src/code/z_collision_check.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 771368e35..98ea5c09a 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -172,7 +172,7 @@ s32 Collider_DestroyElementDamageInfoAT(PlayState* play, ColliderElementDamageIn s32 Collider_SetElementDamageInfoAT(PlayState* play, ColliderElementDamageInfoAT* dest, ColliderElementDamageInfoAT* src) { dest->dmgFlags = src->dmgFlags; - dest->effect = src->effect; + dest->hitSpecialEffect = src->hitSpecialEffect; dest->damage = src->damage; return true; } @@ -1735,7 +1735,7 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* atCol, ColliderElement* acElem->acHitElem = atElem; acElem->acElemFlags |= ACELEM_HIT; if (acCol->actor != NULL) { - acCol->actor->colChkInfo.acHitEffect = atElem->atDmgInfo.effect; + acCol->actor->colChkInfo.acHitSpecialEffect = atElem->atDmgInfo.hitSpecialEffect; } acElem->acDmgInfo.hitPos.x = hitPos->x; acElem->acDmgInfo.hitPos.y = hitPos->y; @@ -3016,7 +3016,7 @@ void CollisionCheck_ResetDamage(CollisionCheckInfo* info) { info->damage = 0; info->damageReaction = 0; info->atHitBacklash = HIT_BACKLASH_0; - info->acHitEffect = 0; + info->acHitSpecialEffect = HIT_SPECIAL_EFFECT_0; info->displacement.x = info->displacement.y = info->displacement.z = 0.0f; } |