summaryrefslogtreecommitdiff
path: root/src/SSystem
diff options
context:
space:
mode:
authorCaroline Madsen <69010899+randomsalience@users.noreply.github.com>2025-04-01 22:05:30 -0400
committerGitHub <noreply@github.com>2025-04-01 19:05:30 -0700
commite55c504f28caf0815a0bf7ba31c4014dd8d3d849 (patch)
tree83510f9cd7889fa10bbdb5d522093c6977a99036 /src/SSystem
parent9847b2a2787b0db8ce931552fa6d99da21ad0873 (diff)
d_camera work (#2369)
* bumpCheck matching * checkGroundInfo matching * chaseCamera matching * lockonCamera attempted * talktoCamera matching * subjectCamera, magneCamera matching * colosseumCamera close, plus various fixes * towerCamera attempted * hookshotCamera matching
Diffstat (limited to 'src/SSystem')
-rw-r--r--src/SSystem/SComponent/c_cc_d.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp
index 864ce62b01..713ba728a0 100644
--- a/src/SSystem/SComponent/c_cc_d.cpp
+++ b/src/SSystem/SComponent/c_cc_d.cpp
@@ -294,9 +294,9 @@ void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 2;
pshape->_14 = 0.0f;
pshape->_10 = 0.0f;
- pshape->_C = 0.0f;
- pshape->_8 = 0.0f;
- pshape->_4 = 0.0f;
+ pshape->_4.z = 0.0f;
+ pshape->_4.y = 0.0f;
+ pshape->_4.x = 0.0f;
}
/* 80263A88-80263B58 25E3C8 00D0+00 1/0 1/0 0/0 .text
@@ -594,9 +594,9 @@ bool cCcD_CylAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
* getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape */
void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 1;
- pshape->_4 = mCenter.x;
- pshape->_8 = mCenter.y;
- pshape->_C = mCenter.z;
+ pshape->_4.x = mCenter.x;
+ pshape->_4.y = mCenter.y;
+ pshape->_4.z = mCenter.z;
pshape->_10 = mRadius;
pshape->_14 = mHeight;
}
@@ -716,9 +716,9 @@ bool cCcD_SphAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
* getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape */
void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 0;
- pshape->_4 = mCenter.x;
- pshape->_8 = mCenter.y;
- pshape->_C = mCenter.z;
+ pshape->_4.x = mCenter.x;
+ pshape->_4.y = mCenter.y;
+ pshape->_4.z = mCenter.z;
pshape->_10 = mRadius;
pshape->_14 = 0.0f;
}
@@ -790,4 +790,4 @@ void cCcD_ObjCo::SetIGrp(u32 grp) {
void cCcD_ObjCo::SetVsGrp(u32 grp) {
mSPrm &= ~0x70;
mSPrm |= grp;
-} \ No newline at end of file
+}