summaryrefslogtreecommitdiff
path: root/src/d/col/c/c_cc_d.cpp
diff options
context:
space:
mode:
authorelijah-thomas774 <elijahthomas774@gmail.com>2025-05-26 22:12:25 -0400
committerelijah-thomas774 <elijahthomas774@gmail.com>2025-05-26 22:12:25 -0400
commit00a4d0a1665af090e9829ee246cdfce27c39c657 (patch)
tree1c2ead4822a670153a22c22122c0c7817322baf4 /src/d/col/c/c_cc_d.cpp
parent01839e716fb4c7ac9afd4fb3d5c05ed1c6516db7 (diff)
intial progress
Diffstat (limited to 'src/d/col/c/c_cc_d.cpp')
-rw-r--r--src/d/col/c/c_cc_d.cpp17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/d/col/c/c_cc_d.cpp b/src/d/col/c/c_cc_d.cpp
index f8669ee6..e6f58d49 100644
--- a/src/d/col/c/c_cc_d.cpp
+++ b/src/d/col/c/c_cc_d.cpp
@@ -14,9 +14,10 @@
#include "m/m_mtx.h"
#include "m/m_vec.h"
#include "nw4r/types_nw4r.h"
-#include "rvl/MTX.h" // IWYU pragma: export
#include "s/s_Math.h"
+#include "rvl/MTX.h" // IWYU pragma: export
+
static inline void MtxTransMinusXYZ(mMtx_c &mtx, f32 x, f32 y, f32 z) {
PSMTXTrans(mtx, -x, -y, -z);
}
@@ -1448,8 +1449,14 @@ void cCcD_ObjAt::AdjustHitPos(f32 x, f32 z) {
}
cCcD_ObjTg::cCcD_ObjTg()
- : mShieldFrontRangeYAngle(nullptr), mField_0x4A(0), mField_0x4B(0), mField_0x4C(0), mField_0x50(0), mField_0x54(0),
- mField_0x6C(0.f, 0.f, 0.f), mField_0x78(0) {}
+ : mShieldFrontRangeYAngle(nullptr),
+ mField_0x4A(0),
+ mField_0x4B(0),
+ mField_0x4C(0),
+ mField_0x50(0),
+ mField_0x54(0),
+ mField_0x6C(0.f, 0.f, 0.f),
+ mField_0x78(0) {}
cCcD_ObjTg::~cCcD_ObjTg() {}
@@ -1480,10 +1487,10 @@ cCcD_ObjCo::~cCcD_ObjCo() {}
void cCcD_ObjCo::Set(const cCcD_SrcGObjCo &src) {
mEffCounter = 0;
mSrc = src;
- SetCoFlag(mSrc.mSPrm & 0x1e0);
+ SetGrp(mSrc.mSPrm & 0x1e0);
}
-void cCcD_ObjCo::SetCoFlag(u32 flag) {
+void cCcD_ObjCo::SetGrp(u32 flag) {
mSrc.mSPrm = mSrc.mSPrm & ~0x1E0 | flag;
mGrp = (mSrc.mSPrm & 0x1E0) >> 4;
}