diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-11-22 13:32:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-22 14:32:01 -0700 |
| commit | d0e243a22a66d849947f763483a02105f7a2ec3a (patch) | |
| tree | aef949c6178e5ccb7606b6784576a0afac1be4c9 /include/SSystem | |
| parent | 2159eac680836de5dba2e0a987f83b7262f07180 (diff) | |
d_a_b_zant matched + linked (#2253)
* work on b_zant
* zant work
* more zant work
* all b_zant functions done
* some doc work
* some more doc work
* d_a_b_zant linked
* fix d_a_b_zant_magic issue
Diffstat (limited to 'include/SSystem')
| -rw-r--r-- | include/SSystem/SComponent/c_cc_d.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 93fa315a57..320762ae96 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -388,6 +388,7 @@ public: STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase)); +#pragma pack(1) class cCcD_ObjAt : public cCcD_ObjCommonBase { public: cCcD_ObjAt() { mType = 0; } @@ -408,7 +409,9 @@ public: protected: /* 0x10 */ int mType; /* 0x14 */ u8 mAtp; + /* 0x15 */ u8 field_0x15[3]; }; +#pragma pack() STATIC_ASSERT(0x18 == sizeof(cCcD_ObjAt)); @@ -486,7 +489,7 @@ public: void SetAtHit(cCcD_Obj* obj) { mObjAt.SetHit(obj); } void SetTgHit(cCcD_Obj* obj) { mObjTg.SetHit(obj); } void SetCoHit(cCcD_Obj* obj) { mObjCo.SetHit(obj); } - BOOL ChkAtType(u32 type) const { return mObjAt.MskType(type); } + u32 ChkAtType(u32 type) const { return mObjAt.MskType(type); } u32 ChkCoNoCrr() const { return mObjCo.ChkNoCrr(); } void OnCoNoCrrBit() { mObjCo.OnNoCrrBit(); } u32 ChkCoSph3DCrr() const { return mObjCo.ChkSph3DCrr(); } |