Skip to content

Commit 02ded44

Browse files
TtobasTtobas
andauthored
d_a_obj_zdoor matching (#2334)
* Fully matching * Fix PR comments * Fix PR comments (rename parameter in callback functions) --------- Co-authored-by: Ttobas <[email protected]>
1 parent 1a5a819 commit 02ded44

File tree

3 files changed

+228
-292
lines changed

3 files changed

+228
-292
lines changed

configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2133,7 +2133,7 @@ def MatchingFor(*versions):
21332133
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_yel_bag"),
21342134
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ystone"),
21352135
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zcloth"),
2136-
ActorRel(NonMatching, "d_a_obj_zdoor"),
2136+
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zdoor"),
21372137
ActorRel(NonMatching, "d_a_obj_zrTurara"),
21382138
ActorRel(MatchingFor("GZ2E01"), "d_a_obj_zrTuraraRock"),
21392139
ActorRel(Equivalent, "d_a_obj_zraMark"), # weak func order

include/d/actor/d_a_obj_zdoor.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,16 @@ class daZdoor_c : public dBgS_MoveBgActor {
2828

2929
u32 getType() { return fopAcM_GetParamBit(this, 0, 4); }
3030

31-
private:
3231
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
3332
/* 0x5A8 */ J3DModel* mpModel;
3433
/* 0x5AC */ dBgS_ObjAcch mObjAcch;
3534
/* 0x784 */ dBgS_AcchCir mAcchCir;
3635
/* 0x7C4 */ dCcD_Stts mStts;
37-
/* 0x800 */ dCcD_Cyl field_0x800[4];
38-
/* 0xCF0 */ dCcD_Cyl field_0xcf0;
39-
/* 0xE2C */ s16 field_0xe2c;
40-
/* 0xE2E */ s16 field_0xe2e;
41-
/* 0xE30 */ u8 field_0xe30;
36+
/* 0x800 */ dCcD_Cyl mCallbackCylinders[4];
37+
/* 0xCF0 */ dCcD_Cyl mCylinder;
38+
/* 0xE2C */ s16 mOpenSpeed;
39+
/* 0xE2E */ s16 mOpenAngle;
40+
/* 0xE30 */ u8 mDoorType;
4241
};
4342

4443
STATIC_ASSERT(sizeof(daZdoor_c) == 0xE34);

0 commit comments

Comments
 (0)