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

Cleanup colliders struct members 1 (#2462)

Browse source 
* Standardize some ColliderJntSphElement buffer members on `colliderElements`

* Standardize some ColliderTrisElement buffer members on `colliderElements`

* format
This commit is contained in:
Dragorn421 2025-02-11 02:02:56 +01:00 • committed by GitHub
parent be1f9e75f0
commit 3dd893c210
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
78 changed files with 92 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c
View file

@ -213,7 +213,7 @@ void ObjSwitch_InitJntSphCollider(ObjSwitch* this, PlayState* play, ColliderJntS
ColliderJntSph* colliderJntSph = &this->jntSph.col;
Collider_InitJntSph(play, colliderJntSph);
Collider_SetJntSph(play, colliderJntSph, &this->dyna.actor, colliderJntSphInit, this->jntSph.items);
Collider_SetJntSph(play, colliderJntSph, &this->dyna.actor, colliderJntSphInit, this->jntSph.elements);
Matrix_SetTranslateRotateYXZ(this->dyna.actor.world.pos.x,
this->dyna.actor.world.pos.y +
this->dyna.actor.shape.yOffset * this->dyna.actor.scale.y,
@ -229,7 +229,7 @@ void ObjSwitch_InitTrisCollider(ObjSwitch* this, PlayState* play, ColliderTrisIn
Vec3f pos[3];
Collider_InitTris(play, colliderTris);
Collider_SetTris(play, colliderTris, &this->dyna.actor, colliderTrisInit, this->tris.items);
Collider_SetTris(play, colliderTris, &this->dyna.actor, colliderTrisInit, this->tris.elements);
for (i = 0; i < 2; i++) {
for (j = 0; j < 3; j++) {

4
src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h
View file

@ -27,12 +27,12 @@ typedef enum ObjSwitchSubType {
typedef struct ObjSwitchJntSph {
/* 0x00 */ ColliderJntSph col;
/* 0x20 */ ColliderJntSphElement items[1];
/* 0x20 */ ColliderJntSphElement elements[1];
} ObjSwitchJntSph;
typedef struct ObjSwitchTris {
/* 0x00 */ ColliderTris col;
/* 0x20 */ ColliderTrisElement items[2];
/* 0x20 */ ColliderTrisElement elements[2];
} ObjSwitchTris;
typedef struct ObjSwitch {