mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +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
parent bf37ad1368
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

14
src/overlays/actors/ovl_En_Dns/z_en_dns.c
View file

@ -66,8 +66,8 @@ static ColliderCylinderInitType1 sCylinderInit = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
TOUCH_NONE,
BUMP_ON,
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON,
},
{ 18, 32, 0, { 0, 0, 0 } },
@ -156,7 +156,7 @@ void EnDns_Init(Actor* thisx, PlayState* play) {
Actor_SetScale(&this->actor, 0.01f);
this->actor.colChkInfo.mass = MASS_IMMOVABLE;
this->bumpOn = true;
this->isColliderEnabled = true;
this->standOnGround = true;
this->dropCollectible = false;
this->actor.speed = 0.0f;
@ -434,7 +434,7 @@ void EnDns_SetupBurrow(EnDns* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
this->dnsItemEntry->payment(this);
this->dropCollectible = true;
this->bumpOn = false;
this->isColliderEnabled = false;
this->actor.flags &= ~ACTOR_FLAG_0;
EnDns_ChangeAnim(this, DNS_ANIM_BURROW);
this->actionFunc = EnDns_Burrow;
@ -442,7 +442,7 @@ void EnDns_SetupBurrow(EnDns* this, PlayState* play) {
} else {
this->dnsItemEntry->payment(this);
this->dropCollectible = true;
this->bumpOn = false;
this->isColliderEnabled = false;
this->actor.flags &= ~ACTOR_FLAG_0;
EnDns_ChangeAnim(this, DNS_ANIM_BURROW);
this->actionFunc = EnDns_Burrow;
@ -451,7 +451,7 @@ void EnDns_SetupBurrow(EnDns* this, PlayState* play) {
void EnDns_SetupNoSaleBurrow(EnDns* this, PlayState* play) {
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) {
this->bumpOn = false;
this->isColliderEnabled = false;
this->actor.flags &= ~ACTOR_FLAG_0;
EnDns_ChangeAnim(this, DNS_ANIM_BURROW);
this->actionFunc = EnDns_Burrow;
@ -515,7 +515,7 @@ void EnDns_Update(Actor* thisx, PlayState* play) {
Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 20.0f, 20.0f, UPDBGCHECKINFO_FLAG_2);
}
if (this->bumpOn) {
if (this->isColliderEnabled) {
Collider_UpdateCylinder(&this->actor, &this->collider);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
}

2
src/overlays/actors/ovl_En_Dns/z_en_dns.h
View file

@ -58,7 +58,7 @@ typedef struct EnDns {
/* 0x026C */ ColliderCylinder collider;
/* 0x02B8 */ s16 dustTimer;
/* 0x02BA */ u8 animIndex; // set but not read
/* 0x02BB */ u8 bumpOn;
/* 0x02BB */ u8 isColliderEnabled;
/* 0x02BC */ u8 standOnGround;
/* 0x02BD */ u8 dropCollectible;
/* 0x02C0 */ DnsItemEntry* dnsItemEntry;