diff options
| author | Pheenoh <pheenoh@gmail.com> | 2023-03-17 21:05:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-17 21:05:06 -0600 |
| commit | 3cdef97cb8648cf5a5f2151938c5fa8d66056751 (patch) | |
| tree | e96e03eb21c61f9aa4cd2868724b55b4872a190b /include/SSystem | |
| parent | a01d65b0b99400f62d93eee28475872b641cfd50 (diff) | |
d_file_select, JASResArcLoader, d_a_obj_stone, d_a_obj_stone_mark (#309)
* setup TU
* JASResArcLoader OK
* d_a_obj_stoneMark work
* some funcs in d_a_obj_stoneMark
* many changes
* quat, d_a_obj_stone, d_a_alink, fix python script, tidy makefile
* d_file_select functions + pr cleanup
Diffstat (limited to 'include/SSystem')
| -rw-r--r-- | include/SSystem/SComponent/c_cc_d.h | 1 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_math.h | 4 | ||||
| -rw-r--r-- | include/SSystem/SComponent/c_sxyz.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index f37db70369..f01ab4d0d1 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -457,6 +457,7 @@ public: void OnCoSetBit() { mObjCo.OnSPrmBit(1); } void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); } void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); } + void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); } }; // Size = 0x40 diff --git a/include/SSystem/SComponent/c_math.h b/include/SSystem/SComponent/c_math.h index 86330cc7d3..8369f5238a 100644 --- a/include/SSystem/SComponent/c_math.h +++ b/include/SSystem/SComponent/c_math.h @@ -29,6 +29,10 @@ inline s16 cM_deg2s(f32 val) { return val * 182.04445f; } +inline s16 i_cM_deg2s(f32 val) { + return val; +} + inline f32 cM_fsin(f32 v) { return JMASSin(cM_rad2s(v)); } diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h index c595b8f495..7395f7e142 100644 --- a/include/SSystem/SComponent/c_sxyz.h +++ b/include/SSystem/SComponent/c_sxyz.h @@ -7,7 +7,7 @@ class csXyz : public SVec { public: static const csXyz Zero; - /* 80018BD0 */ ~csXyz() {} + /* 80018BD0 */ ~csXyz() {}; /* inline */ csXyz() {} /* inline */ csXyz(const csXyz& other) : SVec(other){}; /* 802673F4 */ csXyz(s16, s16, s16); |