mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup colliders struct members 2 (#2465)

Browse source 
* Cleanup colliders 2

* format

* fixes & review
This commit is contained in:
Dragorn421 2025-02-12 19:37:05 +01:00 • committed by GitHub
parent e3831947b0
commit 1d2c912fbb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
58 changed files with 497 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -389,7 +389,7 @@ void BossMo_Init(Actor* thisx, PlayState* play2) {
this->actor.world.pos.y = MO_WATER_LEVEL(play);
this->actor.prevPos = this->targetPos = this->actor.world.pos;
Collider_InitJntSph(play, &this->tentCollider);
Collider_SetJntSph(play, &this->tentCollider, &this->actor, &sJntSphInit, this->tentElements);
Collider_SetJntSph(play, &this->tentCollider, &this->actor, &sJntSphInit, this->tentColliderElements);
this->tentMaxAngle = 1.0f;
}
}
@ -1151,7 +1151,7 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) {
s16 i2;
ColliderElement* acHitElem;
for (i1 = 0; i1 < ARRAY_COUNT(this->tentElements); i1++) {
for (i1 = 0; i1 < ARRAY_COUNT(this->tentColliderElements); i1++) {
if (this->tentCollider.elements[i1].base.acElemFlags & ACELEM_HIT) {
for (i2 = 0; i2 < 19; i2++) {

2
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
View file

@ -124,7 +124,7 @@ typedef struct BossMo {
/* 0x100C */ f32 subCamYawShake;
/* 0x1010 */ Vec3f tentTipPos;
/* 0x101C */ ColliderJntSph tentCollider;
/* 0x103C */ ColliderJntSphElement tentElements[19];
/* 0x103C */ ColliderJntSphElement tentColliderElements[19];
/* 0x14FC */ ColliderCylinder coreCollider;
/* 0x1548 */ char unk_1548[0x44];
} BossMo; // size = 0x158C