mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-09-07 19:11:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

mField -> field

Browse Source
This commit is contained in:
elijah-thomas774
2025-09-16 22:30:32 -04:00
parent e3b5103cbe
commit 4894038c4e
55 changed files with 684 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/col/c/c_bg_s_chk.h
+9 -10
View File
@@ -7,7 +7,6 @@
#include "rvl/MTX.h" // IWYU pragma: export
struct cBgD_Vtx_t : public nw4r::math::VEC3 {};
class cBgS_GrpPassChk {
@@ -23,9 +22,9 @@ public:
/* 0x00 */ cBgS_PolyPassChk *mPolyPassChk;
/* 0x04 */ cBgS_GrpPassChk *mGrpPassChk;
/* 0x08 */ u32 mActorId;
/* 0x0C */ u16 mField_0x0C;
/* 0x0E */ u16 mField_0x0E;
/* 0x10 */ u8 mField_0x10;
/* 0x0C */ u16 field_0x0C;
/* 0x0E */ u16 field_0x0E;
/* 0x10 */ u8 field_0x10;
/* 0x14 */ cPartition mPartition;
/* 0x24 */ // __vtable__
@@ -49,27 +48,27 @@ public:
int ChkSameActorPid(const fBase_c *pActor) const {
int id = pActor ? pActor->mID : 0;
if (id == 0 || mActorId == 0 || mField_0x10 == 0) {
if (id == 0 || mActorId == 0 || field_0x10 == 0) {
return false;
}
return mActorId == id ? 1 : 0;
}
bool ChkField_0xC(const dBgW_Base *pBg) const {
return mField_0x0C & pBg->GetField_0x20();
return field_0x0C & pBg->GetField_0x20();
}
bool ChkField_0xE(const dBgW_Base *pBg) const {
return mField_0x0E & pBg->GetField_0x22();
return field_0x0E & pBg->GetField_0x22();
}
void SetExtChk(const cBgS_Chk &other) {
mPolyPassChk = other.mPolyPassChk;
mGrpPassChk = other.mGrpPassChk;
mActorId = other.mActorId;
mField_0x10 = other.mField_0x10;
mField_0x0C = other.mField_0x0C;
mField_0x0E = other.mField_0x0E;
field_0x10 = other.field_0x10;
field_0x0C = other.field_0x0C;
field_0x0E = other.field_0x0E;
}
};
include/d/col/c/c_bg_s_gnd_chk.h
+3 -3
View File
@@ -10,8 +10,8 @@ public:
/* 0x54 */ mVec3_c mPos;
/* 0x60 */ f32 mNowY;
/* 0x64 */ u8 unk0x64[0x68 - 0x64];
/* 0x68 */ mVec3_c mField_0x68;
/* 0x74 */ u8 mField_0x74;
/* 0x68 */ mVec3_c field_0x68;
/* 0x74 */ u8 field_0x74;
cBgS_GndChk();
virtual ~cBgS_GndChk();
@@ -28,7 +28,7 @@ public:
return mPos;
}
void SetField_0x68(const mVec3_c &other) {
mField_0x68 = other;
field_0x68 = other;
}
// u32 GetWallPrecheck() const {
// return mWallPrecheck;
include/d/col/c/c_bg_s_lin_chk.h
+1 -1
View File
@@ -8,7 +8,7 @@
class cBgS_LinChk : public cBgS_Chk, public cBgS_PolyInfo {
public:
/* 0x54 */ cM3dGLin mLin;
/* 0x6C */ mVec3_c mField_0x6C;
/* 0x6C */ mVec3_c field_0x6C;
/* 0x78 */ bool mFrontFlag;
/* 0x79 */ bool mBackFlag;
/* 0x7A */ bool mHit;
include/d/col/c/c_bg_s_poly_info.h
+2 -2
View File
@@ -14,7 +14,7 @@ private:
/* 0x08 */ void *unk_0x04; // Collision Pointer?
/* 0x0C */ int mActorPId; // Matched the Unique Actor Id
/* 0x10 */ cM3dGPla mPla;
/* 0x20 */ mVec3_c mField_0x20;
/* 0x20 */ mVec3_c field_0x20;
public:
cBgS_PolyInfo() {
@@ -56,7 +56,7 @@ public:
}
const mVec3_c &GetField0x20() const {
return mField_0x20;
return field_0x20;
}
};
include/d/col/c/c_cc_d.h
+34 -34
View File
@@ -82,10 +82,10 @@ public:
struct Shape {
~Shape();
/* 0x00 */ int mField_0x00;
/* 0x04 */ mVec3_c mField_0x04;
/* 0x10 */ mVec3_c mField_0x10;
/* 0x1C */ mVec3_c mField_0x1C;
/* 0x00 */ int field_0x00;
/* 0x04 */ mVec3_c field_0x04;
/* 0x10 */ mVec3_c field_0x10;
/* 0x1C */ mVec3_c field_0x1C;
};
cCcD_ShapeAttr();
/* vt 0x08 */ virtual ~cCcD_ShapeAttr();
@@ -286,8 +286,8 @@ public:
/* 0x04 */ int mAtOldApid;
/* 0x08 */ int mTgApid;
/* 0x0C */ int mTgOldApid;
/* 0x10 */ mVec3_c mField_0x10;
/* 0x1C */ mVec3_c mField_0x1C;
/* 0x10 */ mVec3_c field_0x10;
/* 0x1C */ mVec3_c field_0x1C;
/* 0x28 */ mVec3_c mCcMove;
/* 0x34 */ dAcObjBase_c *mpActor;
/* 0x38 */ int mRank;
@@ -318,17 +318,17 @@ public:
};
struct cCcD_SrcGObjTgInfo {
/* 0x00 */ u8 mField_0x0;
/* 0x01 */ u8 mField_0x1;
/* 0x02 */ u16 mField_0x2;
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u16 field_0x2;
};
struct cCcD_SrcGObjTg {
/* 0x00 */ u32 mType;
/* 0x04 */ u32 mSPrm;
/* 0x08 */ cCcD_SrcGObjTgInfo mInfo;
/* 0x0C */ u16 mField_0x0C;
/* 0x0E */ u16 mField_0x0E;
/* 0x0C */ u16 field_0x0C;
/* 0x0E */ u16 field_0x0E;
};
enum dCcD_ObjAtType {
@@ -378,8 +378,8 @@ enum cCcD_AtModifiers_e {
/* 0x 0000 0400 */ AT_MOD_CURSED = (1 << 10),
};
struct cCcD_SrcGObjAtInfo {
/* 0x00 */ u8 mField_0x0;
/* 0x01 */ u8 mField_0x1;
/* 0x00 */ u8 field_0x0;
/* 0x01 */ u8 field_0x1;
/* 0x02 */ u16 mModifier;
};
@@ -392,11 +392,11 @@ struct cCcD_SrcGObjAt {
/* 0x04 */ u32 mSPrm;
/* 0x08 */ cCcD_SrcGObjAtInfo mInfo;
/* 0x0C */ u8 mDamage;
/* 0x0D */ u8 mField_0xD;
/* 0x0E */ u8 mField_0xE;
/* 0x0F */ u8 mField_0xF;
/* 0x10 */ u16 mField_0x10;
/* 0x12 */ s16 mField_0x12;
/* 0x0D */ u8 field_0xD;
/* 0x0E */ u8 field_0xE;
/* 0x0F */ u8 field_0xF;
/* 0x10 */ u16 field_0x10;
/* 0x12 */ s16 field_0x12;
};
struct cCcD_SrcGObjCo {
@@ -567,7 +567,7 @@ public:
/* 0x30 */ mVec3_c mHitPos;
/* 0x3C */ mVec3_c mVec;
/* 0x48 */ cCcD_SrcGObjTg mTgHitSrc;
/* 0x58 */ cCcD_HitCallback mField_0x58;
/* 0x58 */ cCcD_HitCallback field_0x58;
};
class cCcD_ObjTg : public cCcD_GAtTgCoCommonBase {
@@ -589,11 +589,11 @@ public:
}
void SetFlag_0xA(u16 flag) {
mSrc.mField_0x0E = flag;
mSrc.field_0x0E = flag;
}
u16 GetFlag_0xA(u16 mask) const {
return mSrc.mField_0x0E & mask;
return mSrc.field_0x0E & mask;
}
void ClrSet() {
OffSPrm(1);
@@ -603,7 +603,7 @@ public:
}
void Set_0x4C(u32 f) {
mField_0x4C = f;
field_0x4C = f;
}
u32 MskType(u32 mask) const {
@@ -654,15 +654,15 @@ public:
}
void Set_0x4B(u8 val) {
mField_0x4B = val;
field_0x4B = val;
}
void SetInfo_0x1(u8 val) {
mSrc.mInfo.mField_0x1 = val;
mSrc.mInfo.field_0x1 = val;
}
void SetInfo_0x2(u16 val) {
mSrc.mInfo.mField_0x2 = val;
mSrc.mInfo.field_0x2 = val;
}
public:
@@ -671,14 +671,14 @@ public:
/* 0x38 */ mVec3_c mHitPos;
/* 0x44 */ s16 *mShieldFrontRangeYAngle;
/* 0x48 */ s16 mShieldRange;
/* 0x4A */ u8 mField_0x4A;
/* 0x4B */ u8 mField_0x4B;
/* 0x4C */ u32 mField_0x4C;
/* 0x50 */ u32 mField_0x50;
/* 0x54 */ cCcD_ShieldChkCallback mField_0x54;
/* 0x4A */ u8 field_0x4A;
/* 0x4B */ u8 field_0x4B;
/* 0x4C */ u32 field_0x4C;
/* 0x50 */ u32 field_0x50;
/* 0x54 */ cCcD_ShieldChkCallback field_0x54;
/* 0x58 */ cCcD_SrcGObjAt mAtHitSrc;
/* 0x6C */ mVec3_c mField_0x6C;
/* 0x78 */ cCcD_HitCallback mField_0x78;
/* 0x6C */ mVec3_c field_0x6C;
/* 0x78 */ cCcD_HitCallback field_0x78;
};
class cCcD_ObjCo : public cCcD_GAtTgCoCommonBase {
@@ -719,7 +719,7 @@ public:
/* 0x1C */ cCcD_SrcGObjCo mSrc;
/* 0x20 */ u32 mGrp;
/* 0x24 */ cCcD_SrcGObjCo mCoHitSrc;
/* 0x28 */ cCcD_HitCallback mField_0x28_callback;
/* 0x28 */ cCcD_HitCallback field_0x28_callback;
};
// Maybe ?
@@ -736,7 +736,7 @@ public:
/* 0x05C */ cCcD_ObjTg mTg;
/* 0x0D8 */ cCcD_ObjCo mCo;
/* 0x104 */ cCcD_Stts *mStts;
/* 0x108 */ u32 mField_0x108;
/* 0x108 */ u32 field_0x108;
public:
cCcD_Obj();
include/d/col/c/c_m3d_g_cps.h
+2 -2
View File
@@ -9,8 +9,8 @@
class cM3dGCps : public cM3dGLin {
public:
/* 0x18 */ f32 mRadius;
/* 0x1C */ f32 mField_0x1C;
/* 0x20 */ u8 mField_0x20;
/* 0x1C */ f32 field_0x1C;
/* 0x20 */ u8 field_0x20;
/* 0x24 */ u32 mFlags;
cM3dGCps();
include/d/col/c/c_m3d_g_unk.h
+5 -5
View File
@@ -18,12 +18,12 @@ public:
/* 0x60 */ mVec3_c mMin;
/* 0x6C */ mVec3_c mMax;
/* 0x78 */ cM3dGLin mLin;
/* 0x90 */ mVec3_c mField_0x90;
/* 0x9C */ mVec3_c mField_0x9C;
/* 0xA8 */ mVec3_c mField_0xA8;
/* 0xB4 */ u32 mField_0xB4;
/* 0x90 */ mVec3_c field_0x90;
/* 0x9C */ mVec3_c field_0x9C;
/* 0xA8 */ mVec3_c field_0xA8;
/* 0xB4 */ u32 field_0xB4;
/* 0xB8 */ mVec3_c mVirtCenter;
/* 0xC4 */ f32 mField_0xC4;
/* 0xC4 */ f32 field_0xC4;
cM3dGUnk();