mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-30 18:55:54 +00:00
Code Issues Projects Releases Wiki Activity

Colliders: change "touch, bump" to AT and AC (elems) (#1637)

Browse source 
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags

* TOUCH_ -> ATELEM_

* BUMP_ -> ACELEM_

* ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC

* toucher,bumper -> atDmgInfo,acDmgInfo

* Update docs and zcolchk funcs names

* run formatter

* remove the last mentions of "bump" for colliders

* Update renamed functions in disasm
This commit is contained in:
Dragorn421 2024-03-05 01:33:08 +01:00 • committed by GitHub
commit 68a86d2d00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
253 changed files with 1509 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Sb/z_en_sb.c
View file

@ -388,7 +388,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) {
FALLTHROUGH;
case 15: // explosions, arrow, hammer, ice arrow, light arrow, spirit arrow, shadow arrow
if (EnSb_IsVulnerable(this)) {
hitY = this->collider.elem.bumper.hitPos.y - this->actor.world.pos.y;
hitY = this->collider.elem.acDmgInfo.hitPos.y - this->actor.world.pos.y;
yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
if ((hitY < 30.0f) && (hitY > 10.0f) && (yawDiff >= -0x1FFF) && (yawDiff < 0x2000)) {
Actor_ApplyDamage(&this->actor);
@ -406,7 +406,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) {
case 1: // hookshot/longshot
case 13: // all sword damage
if (EnSb_IsVulnerable(this)) {
hitY = this->collider.elem.bumper.hitPos.y - this->actor.world.pos.y;
hitY = this->collider.elem.acDmgInfo.hitPos.y - this->actor.world.pos.y;
yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
if ((hitY < 30.0f) && (hitY > 10.0f) && (yawDiff >= -0x1FFF) && (yawDiff < 0x2000)) {
Actor_ApplyDamage(&this->actor);
@ -430,9 +430,9 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) {
// if player attack didn't do damage, play recoil sound effect and spawn sparks
if (!tookDamage) {
hitPoint.x = this->collider.elem.bumper.hitPos.x;
hitPoint.y = this->collider.elem.bumper.hitPos.y;
hitPoint.z = this->collider.elem.bumper.hitPos.z;
hitPoint.x = this->collider.elem.acDmgInfo.hitPos.x;
hitPoint.y = this->collider.elem.acDmgInfo.hitPos.y;
hitPoint.z = this->collider.elem.acDmgInfo.hitPos.z;
CollisionCheck_SpawnShieldParticlesMetal2(play, &hitPoint);
}
}