cat door cleanup (#3155)

This commit is contained in:
TakaRikka
2026-04-13 01:42:10 -07:00
committed by GitHub
parent d912857ec4
commit def29adbab
2 changed files with 65 additions and 37 deletions
+24 -3
View File
@@ -12,6 +12,27 @@ public:
/* 0xf4 */ s16 angle;
};
class daObjCatDoor_Attr_c {
public:
/* 0x0 */ s16 speed;
/* 0x2 */ s16 decay_rate;
};
class daObjCatDoor_Hio_c : public mDoHIO_entry_c {
public:
daObjCatDoor_Hio_c();
~daObjCatDoor_Hio_c();
void genMessage(JORMContext*);
void ct();
void dt();
void default_set();
/* 0x8 */ int field_0x8;
/* 0xC */ daObjCatDoor_Attr_c m_attr;
};
/**
* @ingroup actors-objects
* @class daObjCatDoor_c
@@ -24,7 +45,7 @@ class daObjCatDoor_c : public fopAc_ac_c {
public:
inline ~daObjCatDoor_c();
const s16* attr() const;
const daObjCatDoor_Attr_c* attr() const;
void initBaseMtx();
void setBaseMtx();
void calcOpen();
@@ -45,7 +66,7 @@ public:
}
void setDoorOpen() {
mRotSpeed = attr()[1];
mRotSpeed = attr()->decay_rate;
dBgW* bgw1 = &mDoor1.bgw;
if (bgw1->ChkUsed()) {
dComIfG_Bgsp().Release(bgw1);
@@ -67,7 +88,7 @@ private:
/* 0x790 */ s16 mRotSpeed;
public:
static u32 const M_attr;
static const daObjCatDoor_Attr_c M_attr;
};
#endif /* D_A_OBJ_CATDOOR_H */