mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-01 00:08:16 -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
src/JSystem/JParticle/JPAResource.cpp
+4 -4
View File
@@ -42,7 +42,7 @@ JPAResource::JPAResource() {
mpCalcEmitterFuncListNum = 0;
mTDB1Num = 0;
mKeyBlockNum = 0;
mFieldBlockNum = 0;
fieldBlockNum = 0;
mUsrIdx = 0;
}
@@ -753,7 +753,7 @@ bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
} else {
calcKey(work);
for (int i = mFieldBlockNum - 1; i >= 0; i--) {
for (int i = fieldBlockNum - 1; i >= 0; i--) {
mpFieldBlocks[i]->initOpParam();
}
@@ -770,7 +770,7 @@ bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
(*mpCalcEmitterFuncList[i])(work);
}
for (int i = mFieldBlockNum - 1; i >= 0; i--) {
for (int i = fieldBlockNum - 1; i >= 0; i--) {
mpFieldBlocks[i]->prepare(work);
}
@@ -1059,7 +1059,7 @@ void JPAResource::calc_c(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
/* 80276684-80276700 270FC4 007C+00 0/0 2/2 0/0 .text
* calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle */
void JPAResource::calcField(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
for (int i = mFieldBlockNum - 1; i >= 0; i--) {
for (int i = fieldBlockNum - 1; i >= 0; i--) {
mpFieldBlocks[i]->calc(work, ptcl);
}
}
src/JSystem/JParticle/JPAResourceLoader.cpp
+4 -4
View File
@@ -26,7 +26,7 @@ JPAResourceLoader::JPAResourceLoader(u8 const* data, JPAResourceManager* mgr) {
struct JPAResourceHeader {
/* 0x0 */ u16 mUsrIdx;
/* 0x2 */ u16 mBlockNum;
/* 0x4 */ u8 mFieldBlockNum;
/* 0x4 */ u8 fieldBlockNum;
/* 0x5 */ u8 mKeyBlockNum;
/* 0x6 */ u8 mTDB1Num;
};
@@ -44,9 +44,9 @@ void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* mgr) {
for (int i = 0; i < *(u16*)(data + 8); i++) {
JPAResourceHeader* header = (JPAResourceHeader*)(data + offset);
JPAResource* res = new (heap, 4) JPAResource();
res->mFieldBlockNum = header->mFieldBlockNum;
res->mpFieldBlocks = res->mFieldBlockNum != 0 ?
new (heap, 4) JPAFieldBlock*[res->mFieldBlockNum] : NULL;
res->fieldBlockNum = header->fieldBlockNum;
res->mpFieldBlocks = res->fieldBlockNum != 0 ?
new (heap, 4) JPAFieldBlock*[res->fieldBlockNum] : NULL;
res->mKeyBlockNum = header->mKeyBlockNum;
res->mpKeyBlocks = res->mKeyBlockNum != 0 ?
new (heap, 4) JPAKeyBlock*[res->mKeyBlockNum] : NULL;
src/REL/d/a/d_a_bombf.cpp
+3 -3
View File
@@ -83,7 +83,7 @@ int dAcBombf_c::actorPostCreate() {
if ((b != 0 && field_0x3D2 == 2) || (b == 0 && field_0x3D2 == 0)) {
mModel.setScale(0.0001f, 0.0001f, 0.0001f);
if (mBombRef.get() != nullptr) {
mBombRef.get()->mField_0xA50 = 0.0001f;
mBombRef.get()->field_0xA50 = 0.0001f;
}
}
}
@@ -160,7 +160,7 @@ void dAcBombf_c::regrowBomb() {
bomb->setActorProperty(AC_PROP_0x1);
}
if (field_0x3D4 == 0) {
bomb->mField_0xA44 *= 1.5f;
bomb->field_0xA44 *= 1.5f;
}
}
}
@@ -220,7 +220,7 @@ void dAcBombf_c::executeState_Wait() {
bomb = mBombRef.get();
if (bomb != nullptr) {
bomb->mField_0xA50 = scaleFactor;
bomb->field_0xA50 = scaleFactor;
}
}
src/REL/d/a/e/d_a_e_sm.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ int dAcEsm_c::actorCreate() {
mAcchCir.SetWall(mScaleTarget.y * 100.f, mScaleTarget.x * 100.f);
mStts.SetRank(10);
mObjAcch.SetGndThinCellingOff();
mObjAcch.mField_0x390 = 1;
mObjAcch.field_0x390 = 1;
mMaxSpeed = -40.f;
src/REL/d/a/obj/d_a_obj_block_underground.cpp
+6 -6
View File
@@ -172,7 +172,7 @@ int dAcOBlockUnderground::actorExecute() {
if (hasCyl()) {
if (mCyl->ChkTgHit()) {
if (mUndergroundRef.p_owner != nullptr) {
mUndergroundRef.get()->fn_458_9D0(mField_0x57C, mField_0x57E);
mUndergroundRef.get()->fn_458_9D0(field_0x57C, field_0x57E);
}
if (getSubtype() == 1) {
@@ -226,17 +226,17 @@ void dAcOBlockUnderground::setBlockUndergroundPosition(mVec3_c *pos) {
mBgW.Move();
}
void dAcOBlockUnderground::fn_459_840(u16 field_0x57C, u16 field_0x57E) {
mField_0x57C = field_0x57C;
mField_0x57E = field_0x57E;
void dAcOBlockUnderground::fn_459_840(u16 _field_0x57C, u16 _field_0x57E) {
field_0x57C = _field_0x57C;
field_0x57E = _field_0x57E;
}
u16 dAcOBlockUnderground::getField_0x57C() {
return mField_0x57C;
return field_0x57C;
}
u16 dAcOBlockUnderground::getField_0x57E() {
return mField_0x57E;
return field_0x57E;
}
void dAcOBlockUnderground::registBg() {
src/REL/d/a/obj/d_a_obj_chest.cpp
+3 -3
View File
@@ -202,7 +202,7 @@ void dAcOChest_c::executeState_OrderOpenEventAfter() {
if (dAcItem_c::isRupee(itemId)) {
dMessage_c::getInstance()->setField_0x2FC(0xFFFFFFFF);
}
mField_0x65D = true;
field_0x65D = true;
stateOpenUpdate2();
mStateMgr.changeState(StateID_OpenEvent);
}
@@ -240,7 +240,7 @@ void dAcOChest_c::fn_326_C90() {
}
void dAcOChest_c::changeStateOpen() {
if (mField_0x65D) {
if (field_0x65D) {
return;
}
u32 flag = getFromParams(0, 0xFF);
@@ -252,7 +252,7 @@ void dAcOChest_c::changeStateOpen() {
}
void dAcOChest_c::changeStateWait() {
if (!mField_0x65D) {
if (!field_0x65D) {
return;
}
fn_326_1440();
src/REL/d/a/obj/d_a_obj_ivy_rope.cpp
+138 -138
View File
@@ -93,7 +93,7 @@ dAcOivyRope_c::~dAcOivyRope_c() {
void dAcOivyRope_c::initTightRope() {}
void dAcOivyRope_c::fn_256_10C0() {
mField_0x106C = 0.f;
field_0x106C = 0.f;
mVec3_c pnt;
fn_256_30A0(pnt);
@@ -162,14 +162,14 @@ int dAcOivyRope_c::createBase() {
mOldDistance = 2000.f;
mSegmentCount = 81;
mDropsceneFlag = mParams >> 12;
mField_0xFEB = 1;
field_0xFEB = 1;
if (temp < 0.f) {
temp = 0.f;
}
temp /= 750.f;
mField_0x1040 = temp;
field_0x1040 = temp;
if (temp > 1.f) {
mField_0x1040 = 1.f;
field_0x1040 = 1.f;
}
CREATE_ALLOCATOR(dAcOivyRope_c);
@@ -246,10 +246,10 @@ void dAcOivyRope_c::finalizeState_RopeReturn() {}
void dAcOivyRope_c::initializeState_RopeCut() {}
void dAcOivyRope_c::executeState_RopeCut() {
if (mField_0xFF8 != 0) {
if (field_0xFF8 != 0) {
mStateMgr.changeState(StateID_PlayerGrip);
} else {
if (mField_0xFCE != 0 && --mField_0xFCE == 0) {
if (field_0xFCE != 0 && --field_0xFCE == 0) {
mPosition = mTightropeEnd;
}
fn_256_8590();
@@ -258,7 +258,7 @@ void dAcOivyRope_c::executeState_RopeCut() {
}
void dAcOivyRope_c::finalizeState_RopeCut() {
mPosition = mTightropeEnd;
mField_0xFCE = 0;
field_0xFCE = 0;
}
UNKTYPE dAcOivyRope_c::fn_256_7D50(UNKTYPE) {}
@@ -281,12 +281,12 @@ UNKTYPE dAcOivyRope_c::fn_256_9C80(UNKTYPE) {}
UNKTYPE dAcOivyRope_c::fn_256_A040(UNKTYPE) {
// Logically wrong i think
if (mField_0x1062 == 0) {
if (field_0x1062 == 0) {
mVec3_c *pnt2 = mPnts2;
int idx = 1;
if (mSegmentCount > idx) {
f32 f1 = 5.f * mField_0x1040 + 8.f;
f32 f2 = -0.05f * mField_0x1040 + 0.15f;
f32 f1 = 5.f * field_0x1040 + 8.f;
f32 f2 = -0.05f * field_0x1040 + 0.15f;
mVec3_c nextPoint;
mVec3_c vec;
mVec3_c *pnt1 = mPnts1 + 1;
@@ -308,7 +308,7 @@ UNKTYPE dAcOivyRope_c::fn_256_A040(UNKTYPE) {
}
if (mTightropeEnd.y - mDistance >= pnt2->y) {
mField_0x1062 = 1;
field_0x1062 = 1;
}
}
fn_256_A2C0(false);
@@ -319,8 +319,8 @@ void dAcOivyRope_c::fn_256_A2C0(bool bool0) {
f32 fVar13 = 0.f;
f32 fVar14 = mField_0xFAC * (mSegmentCount * 2.f) / 3.0f;
f32 fVar2 = mField_0xFB0 * (mSegmentCount * 2.f) / 3.0f;
f32 fVar14 = field_0xFAC * (mSegmentCount * 2.f) / 3.0f;
f32 fVar2 = field_0xFB0 * (mSegmentCount * 2.f) / 3.0f;
// TODO
}
@@ -330,8 +330,8 @@ bool dAcOivyRope_c::fn_256_A750(bool bool0, f32 float0) {
int idx = 1;
mVec3_c *pnt = mPnts2;
if (mSegmentCount >= idx) {
f32 f1 = 8.f + mField_0x1040 * 5.f;
f32 f2 = 0.15f + mField_0x1040 * -0.05f;
f32 f1 = 8.f + field_0x1040 * 5.f;
f32 f2 = 0.15f + field_0x1040 * -0.05f;
for (; idx < mSegmentCount; idx++) {
mVec3_c vec = pnt[idx + 1] - pnt[idx] + mPnts1[idx];
vec -= f1;
@@ -360,7 +360,7 @@ bool dAcOivyRope_c::fn_256_A750(bool bool0, f32 float0) {
}
f32 dAcOivyRope_c::fn_256_AA40() {
f32 f = mField_0xFB4 / mSegmentCount * 1.5f;
f32 f = field_0xFB4 / mSegmentCount * 1.5f;
f32 ret = f;
if (f < 0.6f) {
@@ -382,14 +382,14 @@ int dAcOivyRope_c::fn_256_AAF0(f32 f1, f32 f2) {
// deal with this later ;-;
f32 f = f1 * f2;
f32 c = -(90.f * f) + 55.f * f * f;
f32 a = 0.8f * (1.f - mField_0x1040);
f32 b = (mField_0xFB4 / mSegmentCount) * c;
return mField_0xFD8 * (1.f - a) * (mField_0xFB4 + b);
f32 a = 0.8f * (1.f - field_0x1040);
f32 b = (field_0xFB4 / mSegmentCount) * c;
return field_0xFD8 * (1.f - a) * (field_0xFB4 + b);
}
void dAcOivyRope_c::fn_256_ABA0() {
mField_0xFDA = 0;
mField_0xFDC = 0;
field_0xFDA = 0;
field_0xFDC = 0;
fn_256_BB70();
fn_256_D050();
mStateMgr.changeState(StateID_RopeWait);
@@ -421,12 +421,12 @@ void dAcOivyRope_c::fn_256_AC00() {
}
fn_256_C410();
mField_0xFF8 = 0;
field_0xFF8 = 0;
}
void dAcOivyRope_c::fn_256_AE00() {
mField_0xFDA = mRotation.x;
mField_0xFDC = mRotation.y;
field_0xFDA = mRotation.x;
field_0xFDC = mRotation.y;
mRotation.x = 0;
mRotation.y = 0;
int i = 0;
@@ -445,8 +445,8 @@ void dAcOivyRope_c::fn_256_AE00() {
mVec3_c tmp2 = tmp - mPosition;
m.copyFrom(mWorldMtx);
m.YrotM(mField_0xFDC);
m.XrotM(mField_0xFDA);
m.YrotM(field_0xFDC);
m.XrotM(field_0xFDA);
mMtx_c m_tmp2;
m_tmp2.transS(tmp2);
@@ -459,7 +459,7 @@ void dAcOivyRope_c::fn_256_AE00() {
}
mStts.SetRank(0);
for (int curr_idx = 0, i = 0; i < mField_0xFEB; curr_idx += 4, ++i) {
for (int curr_idx = 0, i = 0; i < field_0xFEB; curr_idx += 4, ++i) {
int end = mSegmentCount - 1;
int start_idx = curr_idx;
@@ -479,12 +479,12 @@ void dAcOivyRope_c::fn_256_AE00() {
mCpsArr2[i].ClrTgSet();
}
mField_0x1083 = 0.6f * mSegmentCount;
mVec3_c v = fn_256_D730(mField_0x1083);
v.y -= nw4r::math::FAbs(80.f / mField_0xFDA.sin());
field_0x1083 = 0.6f * mSegmentCount;
mVec3_c v = fn_256_D730(field_0x1083);
v.y -= nw4r::math::FAbs(80.f / field_0xFDA.sin());
fn_256_26B0(mField_0x1083, false, v.y);
mField_0xFE2 = -1;
fn_256_26B0(field_0x1083, false, v.y);
field_0xFE2 = -1;
fn_256_D050();
mStateMgr.changeState(StateID_RopeWait);
@@ -508,8 +508,8 @@ void dAcOivyRope_c::fn_256_BAB0(mVec3_c &out, int idx, s16 xRot, s16 yRot) {
}
void dAcOivyRope_c::fn_256_BB70() {
mField_0xFDA = mRotation.x;
mField_0xFDC = mRotation.y;
field_0xFDA = mRotation.x;
field_0xFDC = mRotation.y;
mRotation.x = 0;
mRotation.y = 0;
updateMatrix();
@@ -520,8 +520,8 @@ void dAcOivyRope_c::fn_256_BB70() {
int i;
for (i = 0, pnt1 = &mPnts1[i], pnt2 = &mPnts2[i]; i < mSegmentCount; ++i, pnt2++, pnt1++) {
m.copyFrom(mWorldMtx);
m.YrotM(mField_0xFDC);
m.XrotM(mField_0xFDA);
m.YrotM(field_0xFDC);
m.XrotM(field_0xFDA);
mMtx_c m_tmp;
m_tmp.transS(0.f, -25.f * i, 0.f);
@@ -533,7 +533,7 @@ void dAcOivyRope_c::fn_256_BB70() {
}
mStts.SetRank(1);
for (int curr_idx = 0, i = 0; i < mField_0xFEB; curr_idx += 4, ++i) {
for (int curr_idx = 0, i = 0; i < field_0xFEB; curr_idx += 4, ++i) {
int end = mSegmentCount - 1;
int start_idx = curr_idx;
@@ -553,13 +553,13 @@ void dAcOivyRope_c::fn_256_BB70() {
mCpsArr2[i].ClrTgSet();
}
mField_0xFF6 = 1;
field_0xFF6 = 1;
}
void dAcOivyRope_c::fn_256_BE80() {
f32 step = 0.f;
f32 target = 30.f;
mAng angle = mField_0xFCC - 0x8000;
mAng angle = field_0xFCC - 0x8000;
f32 stepSize = 0.13f * target;
if (mSegmentCount >= 0) {
@@ -578,7 +578,7 @@ void dAcOivyRope_c::fn_256_BE80() {
void dAcOivyRope_c::fn_256_BFF0(int ang, f32 float0, f32 float1) {
f32 target = float0;
f32 tmp = float0 * (0.1f - mField_0x1040 * 0.03f);
f32 tmp = float0 * (0.1f - field_0x1040 * 0.03f);
f32 step = 0;
f32 f = ang;
@@ -606,7 +606,7 @@ void dAcOivyRope_c::fn_256_BFF0(int ang, f32 float0, f32 float1) {
f32 dAcOivyRope_c::fn_256_C200(int ang) {
// I dont like this function
// Some stuff with mField_0xFB4 here
// Some stuff with field_0xFB4 here
f32 y = mPnts2[mSegmentCount - 1].y;
f32 x = mPnts2[mSegmentCount - 1].x - mTightropeEnd.x;
@@ -627,12 +627,12 @@ f32 dAcOivyRope_c::fn_256_C200(int ang) {
tmp0 = 0.5f;
}
tmp1 = 1.0f - mField_0x1040;
tmp1 = 1.0f - field_0x1040;
if (tmp1 < 0.3f) {
tmp1 = 0.3f;
}
tmp2 = mField_0x1050 / 40.f;
tmp2 = field_0x1050 / 40.f;
tmp3 = tmp2 * tmp1;
if (tmp3 > 0.5f) {
tmp3 = 0.5f;
@@ -645,7 +645,7 @@ f32 dAcOivyRope_c::fn_256_C200(int ang) {
tmp1 = 1.f;
}
fn_256_BFF0(ang, tmp1 * (mField_0x1040 * flaot_100 + float_30), tmp1 * float_60);
fn_256_BFF0(ang, tmp1 * (field_0x1040 * flaot_100 + float_30), tmp1 * float_60);
return tmp2;
}
@@ -659,7 +659,7 @@ void dAcOivyRope_c::fn_256_C410() {
}
}
if (mStateMgr.isState(StateID_PlayerGrip) || mField_0xFCE != 0) {
if (mStateMgr.isState(StateID_PlayerGrip) || field_0xFCE != 0) {
return;
}
@@ -669,16 +669,16 @@ void dAcOivyRope_c::fn_256_C410() {
if (count < 0) {
count = 0;
}
for (int i = 0; i < mField_0xFEB; i++) {
for (int i = 0; i < field_0xFEB; i++) {
// TODO
}
}
bool dAcOivyRope_c::fn_256_C6F0() {
if (mField_0x105F) {
mField_0x105F += mField_0x105E;
if (mField_0x105F >= mSegmentCount - 19) {
mField_0x105F = mSegmentCount - 20;
if (field_0x105F) {
field_0x105F += field_0x105E;
if (field_0x105F >= mSegmentCount - 19) {
field_0x105F = mSegmentCount - 20;
return true;
}
}
@@ -686,8 +686,8 @@ bool dAcOivyRope_c::fn_256_C6F0() {
}
void dAcOivyRope_c::fn_256_C740() {
const f32 f2 = (1.f - mField_0x1040) * 4.f + 1.1f;
if (mField_0xFA4 <= f2) {
const f32 f2 = (1.f - field_0x1040) * 4.f + 1.1f;
if (field_0xFA4 <= f2) {
const mVec3_c &pnt = fn_256_D730(mSegmentCount - 1);
const mVec3_c diff = pnt - dAcPy_c::GetLink()->mPosition;
const f32 diffmag = diff.squareMagXZ();
@@ -738,14 +738,14 @@ void dAcOivyRope_c::fn_256_CD40() {
void dAcOivyRope_c::fn_256_CE20(f32 *pOut1, f32 *pOut2, f32 *pOut3) {
f32 f2, f3;
f32 f1 = mField_0xFD6;
f2 = mField_0xFAC * mField_0xFAC + mField_0xFB0 * mField_0xFB0;
f32 f1 = field_0xFD6;
f2 = field_0xFAC * field_0xFAC + field_0xFB0 * field_0xFB0;
f3 = nw4r::math::FSqrt(f2);
f32 temp = f3 / f1;
f2 = nw4r::math::FAbs(temp);
if (f2 > 1.f) {
mField_0xFAC = (mField_0xFD6 - 1) * mField_0xFCC.cos();
mField_0xFB0 = (mField_0xFD6 - 1) * -mField_0xFCC.sin();
field_0xFAC = (field_0xFD6 - 1) * field_0xFCC.cos();
field_0xFB0 = (field_0xFD6 - 1) * -field_0xFCC.sin();
f2 = 1.f;
}
@@ -756,22 +756,22 @@ void dAcOivyRope_c::fn_256_CE20(f32 *pOut1, f32 *pOut2, f32 *pOut3) {
}
void dAcOivyRope_c::fn_256_CFA0(bool bool0) {
if (bool0 && mField_0x1005 != 0) {
mField_0x1005 = 0;
mField_0x105F = mSegmentCount - 24;
if (bool0 && field_0x1005 != 0) {
field_0x1005 = 0;
field_0x105F = mSegmentCount - 24;
mField_0xFF7 = 1;
mField_0xFF6 = 1;
field_0xFF7 = 1;
field_0xFF6 = 1;
mField_0xFC4 = 0.05f;
field_0xFC4 = 0.05f;
mField_0xFD6 = 20;
field_0xFD6 = 20;
mField_0xFA4 = 1.1f + (s8)mField_0x1005 * 0.1f;
mField_0xFA8 = 1.1f + (s8)mField_0x1005 * 0.1f;
field_0xFA4 = 1.1f + (s8)field_0x1005 * 0.1f;
field_0xFA8 = 1.1f + (s8)field_0x1005 * 0.1f;
mField_0xFD2 = 0;
mField_0xFD4 = 0;
field_0xFD2 = 0;
field_0xFD4 = 0;
}
}
void dAcOivyRope_c::fn_256_D050() {
@@ -785,11 +785,11 @@ void dAcOivyRope_c::fn_256_D050() {
void dAcOivyRope_c::fn_256_D110() {
u32 third = (mSegmentCount - 1) / 3;
mField_0xFF0[0] = 0;
field_0xFF0[0] = 0;
for (int i = 1; i <= 3; i++) {
mField_0xFF0[i] = third * i;
if (mField_0xFF0[i] > (mSegmentCount - 1)) {
mField_0xFF0[i] = (mSegmentCount - 1);
field_0xFF0[i] = third * i;
if (field_0xFF0[i] > (mSegmentCount - 1)) {
field_0xFF0[i] = (mSegmentCount - 1);
}
}
}
@@ -803,7 +803,7 @@ void dAcOivyRope_c::fn_256_D1B0() {
mCpsArr[i].SetR(15.f);
mCpsArr[i].OffTgType(AT_TYPE_BEETLE | AT_TYPE_SLINGSHOT | AT_TYPE_SWORD);
mCpsArr[i].OnTgType(AT_TYPE_0x40);
mCpsArr[i].cM3dGLin::Set(fn_256_D730(mField_0xFF0[i]), fn_256_D730(mField_0xFF0[i + 1]));
mCpsArr[i].cM3dGLin::Set(fn_256_D730(field_0xFF0[i]), fn_256_D730(field_0xFF0[i + 1]));
}
}
@@ -812,20 +812,20 @@ void dAcOivyRope_c::fn_256_D2B0() {
return;
}
if (mSubtype == 3 && mField_0x1039 == 3) {
if (mSubtype == 3 && field_0x1039 == 3) {
return;
}
if (mField_0xFEF != 0) {
mField_0xFEF--;
if (field_0xFEF != 0) {
field_0xFEF--;
}
for (int i = 0; i < 3; i++) {
if (mCpsArr[i].ChkTgHit()) {
mField_0xFEF = 2;
field_0xFEF = 2;
}
mCpsArr[i].cM3dGLin::Set(fn_256_D730(mField_0xFF0[i]), fn_256_D730(mField_0xFF0[i + 1]));
mCpsArr[i].cM3dGLin::Set(fn_256_D730(field_0xFF0[i]), fn_256_D730(field_0xFF0[i + 1]));
dCcS::GetInstance()->Set(&mCpsArr[i]);
}
@@ -852,7 +852,7 @@ void dAcOivyRope_c::fn_256_D3D0(mVec3_c &pOut1, mVec3_c &pOut2, s16 param2, bool
m.ZXYrotM(playerRot.x, playerRot.y, playerRot.z);
// name 100% guess
mAng swingAngle = (mField_0xFCC - 0x8000) - dAcPy_c::GetLink()->mRotation.y;
mAng swingAngle = (field_0xFCC - 0x8000) - dAcPy_c::GetLink()->mRotation.y;
f32 something = param2 / 5461.f;
if (something > 1.f) {
@@ -930,7 +930,7 @@ void dAcOivyRope_c::fn_256_D850() {
int idk;
f32 f;
f32 val;
val = nw4r::math::FAbs(mField_0xF68.y - mField_0x27C0);
val = nw4r::math::FAbs(field_0xF68.y - field_0x27C0);
if (!(val > 1000.f)) {
f = 250.f;
idk = f;
@@ -942,7 +942,7 @@ void dAcOivyRope_c::fn_256_D850() {
}
}
mMtx_c m;
m.transS(mField_0xF68);
m.transS(field_0xF68);
drawShadow(mShadow, nullptr, m, &shadow_q, -1, idk, -1, -1, -1, val);
}
} else {
@@ -956,24 +956,24 @@ void dAcOivyRope_c::fn_256_D850() {
extern "C" void *getCamera(int idx);
void dAcOivyRope_c::fn_256_DAA0(bool bool0, bool bool1, f32 float0, f32 float1) {
bool cylHitBellows = false;
if ((bool1 || mField_0xFEF != 0) || (mCyl.ChkTgHit() && mCyl.ChkTgAtHitType(AT_TYPE_BELLOWS))) {
if ((bool1 || field_0xFEF != 0) || (mCyl.ChkTgHit() && mCyl.ChkTgAtHitType(AT_TYPE_BELLOWS))) {
mbField_0x2793 = true;
cylHitBellows = true;
mField_0x2792 = 10;
if (mField_0xFEF && mSubtype != 6) {
field_0x2792 = 10;
if (field_0xFEF && mSubtype != 6) {
float0 = 2.5f;
}
}
if (mbField_0x2793) {
if (mField_0x2790 != 0) {
mField_0x2790--;
if (field_0x2790 != 0) {
field_0x2790--;
}
// This block is a mess
else if (cylHitBellows) {
mField_0x2790 = 30;
f32 target = float0 - mField_0x1040 * 1.5f;
field_0x2790 = 30;
f32 target = float0 - field_0x1040 * 1.5f;
f32 chasing = 0.f;
f32 step = target * float1;
int ang = dAcPy_c::GetLink()->mRotation.y;
@@ -1002,17 +1002,17 @@ void dAcOivyRope_c::fn_256_DAA0(bool bool0, bool bool1, f32 float0, f32 float1)
if (fn_256_A750(bool1, 0.5f)) {
if (!bool0) {
mField_0xFD8 = 1;
f32 target0 = -(mField_0xFD8 * mField_0xFCC.cos());
f32 target1 = -(mField_0xFD8 * -mField_0xFCC.sin());
sLib::addCalc(&mField_0xFAC, target0, 0.4f, 2.0f, 0.5f);
sLib::addCalc(&mField_0xFB0, target1, 0.4f, 2.0f, 0.5f);
field_0xFD8 = 1;
f32 target0 = -(field_0xFD8 * field_0xFCC.cos());
f32 target1 = -(field_0xFD8 * -field_0xFCC.sin());
sLib::addCalc(&field_0xFAC, target0, 0.4f, 2.0f, 0.5f);
sLib::addCalc(&field_0xFB0, target1, 0.4f, 2.0f, 0.5f);
mField_0xFD2 = mField_0xFAC;
mField_0xFD4 = mField_0xFB0;
field_0xFD2 = field_0xFAC;
field_0xFD4 = field_0xFB0;
if (mField_0x2792 != 0) {
mField_0x2792--;
if (field_0x2792 != 0) {
field_0x2792--;
} else {
mbField_0x2793 = false;
}
@@ -1023,7 +1023,7 @@ void dAcOivyRope_c::fn_256_DAA0(bool bool0, bool bool1, f32 float0, f32 float1)
}
} else {
mField_0x2790 = 0;
field_0x2790 = 0;
if (bool0) {
fn_256_9280();
} else {
@@ -1033,20 +1033,20 @@ void dAcOivyRope_c::fn_256_DAA0(bool bool0, bool bool1, f32 float0, f32 float1)
}
void dAcOivyRope_c::fn_256_DE80() {
mField_0x1038 = mSegmentCount - 1;
mField_0x101C = mPnts2[mField_0x1038];
mField_0x102C = mField_0x1028;
mField_0x1032 = 0x4000;
mField_0x1039 = 2;
mField_0x103D = 1;
field_0x1038 = mSegmentCount - 1;
field_0x101C = mPnts2[field_0x1038];
field_0x102C = field_0x1028;
field_0x1032 = 0x4000;
field_0x1039 = 2;
field_0x103D = 1;
}
void dAcOivyRope_c::fn_256_DEE0() {
mField_0x101C = mPnts2[mField_0x1038];
mField_0x102C = mField_0x1028;
mField_0x1032 = 0x4000;
mField_0x1039 = 4;
mField_0x103D = 0;
field_0x101C = mPnts2[field_0x1038];
field_0x102C = field_0x1028;
field_0x1032 = 0x4000;
field_0x1039 = 4;
field_0x103D = 0;
}
u32 dAcOivyRope_c::fn_256_DF30() {}
@@ -1059,48 +1059,48 @@ void dAcOivyRope_c::fn_256_E3E0() {
};
if (mStateMgr.isState(StateID_PlayerGrip)) {
mField_0x1030 = 60;
field_0x1030 = 60;
}
switch (mField_0x1039) {
switch (field_0x1039) {
case 1: {
u32 var = fn_256_DF30();
if (mStateMgr.isState(StateID_PlayerGrip)) {
fn_256_DEE0();
} else if (mField_0x103D != 0) {
if (mField_0x103C != 0) {
mField_0x103C--;
} else if (field_0x103D != 0) {
if (field_0x103C != 0) {
field_0x103C--;
} else {
mField_0x103D = 0;
mField_0x103C = l_some_table[++mField_0x103B];
field_0x103D = 0;
field_0x103C = l_some_table[++field_0x103B];
}
} else if (var == 0) {
if (mField_0x103C != 0) {
mField_0x103C--;
} else if (mField_0x103B >= 12) {
if (field_0x103C != 0) {
field_0x103C--;
} else if (field_0x103B >= 12) {
fn_256_DE80();
} else {
mField_0x103C = l_some_table[++mField_0x103B];
mField_0x103D = 1;
field_0x103C = l_some_table[++field_0x103B];
field_0x103D = 1;
}
}
} break;
case 2: {
mField_0x1039 = fn_256_DF30();
field_0x1039 = fn_256_DF30();
if (mStateMgr.isState(StateID_PlayerGrip)) {
fn_256_DEE0();
} else {
if (fn_256_E790()) {
mField_0x103A = 0;
mField_0x1030 = 60;
field_0x103A = 0;
field_0x1030 = 60;
mStateMgr.changeState(StateID_RopeReturn);
fn_256_DEE0();
}
}
} break;
case 3: {
if (mField_0x103A == -1) {
if (field_0x103A == -1) {
if (fn_256_E790()) {
if (mEventIdx != 0xFF && !mEvent.isThisActorInEvent()) {
static volatile u32 FLAGS_1 = 0x00000001;
@@ -1111,37 +1111,37 @@ void dAcOivyRope_c::fn_256_E3E0() {
mEvent.scheduleEvent(e, 0);
}
}
} else if (mField_0x103A > 0) {
mField_0x103A--;
} else if (mField_0x103A == 0) {
mField_0x1030 = 60;
} else if (field_0x103A > 0) {
field_0x103A--;
} else if (field_0x103A == 0) {
field_0x1030 = 60;
mStateMgr.changeState(StateID_RopeReturn);
fn_256_DEE0();
startSound(SE_IvyRope_HANGDOWN);
}
} break;
case 4: {
mField_0x1039 = fn_256_DF30();
field_0x1039 = fn_256_DF30();
} break;
case 5: {
if (checkObjectProperty(OBJ_PROP_0x1)) {
mField_0x1039 = 2;
field_0x1039 = 2;
} else {
for (int i = 0; i < 0x23; i++) {
mField_0x1039 = fn_256_DF30();
if (mField_0x1039 != 5) {
field_0x1039 = fn_256_DF30();
if (field_0x1039 != 5) {
break;
}
}
if (mField_0x1039 == 5) {
mField_0x1039 = 2;
if (field_0x1039 == 5) {
field_0x1039 = 2;
}
}
} break;
}
if (mField_0x1039 != 0) {
mSph.SetC(mField_0x1010);
if (field_0x1039 != 0) {
mSph.SetC(field_0x1010);
dCcS::GetInstance()->Set(&mSph);
}
}
@@ -1150,12 +1150,12 @@ bool dAcOivyRope_c::fn_256_E790() {
bool ret = false;
if (mDropped) {
mField_0x103A = 0xF;
field_0x103A = 0xF;
ret = true;
}
if (mSph.ChkTgHit()) {
mField_0x103A = 0x1;
field_0x103A = 0x1;
ret = true;
}
src/REL/d/a/obj/d_a_obj_seat_sword.cpp
+8 -8
View File
@@ -90,7 +90,7 @@ int dAcOSeatSword_c::create() {
mMaxSpeed = -40.f;
if (mSubtype == 1) {
mField_0x7E8 = l_inGroundRot;
field_0x7E8 = l_inGroundRot;
}
updateSwordMdl();
mEff.init(this);
@@ -125,7 +125,7 @@ int dAcOSeatSword_c::actorExecute() {
int dAcOSeatSword_c::actorExecuteInEvent() {
if (mbNoSword) {
sLib::chase(&mField_0x7E4, 255.f, 8.f);
sLib::chase(&field_0x7E4, 255.f, 8.f);
}
actorExecuteCommon();
@@ -153,18 +153,18 @@ int dAcOSeatSword_c::actorExecuteInEvent() {
void dAcOSeatSword_c::doInteraction(s32 param0) {
if (param0 == 5) {
mField_0x7EA = true;
field_0x7EA = true;
Event evt((char *)sEventName, 0x190, 0x100001, nullptr, nullptr);
mEvent.scheduleEvent(evt, 0);
} else {
mField_0x7EA = false;
field_0x7EA = false;
}
}
u32 someAng = 0x8000;
void dAcOSeatSword_c::registerInEvent() {
static const u32 rodata_stuff = {0};
if (mField_0x7EA == 1 && EventManager::isCurrentEvent(sEventName)) {
if (field_0x7EA == 1 && EventManager::isCurrentEvent(sEventName)) {
dAcPy_c *player = dAcPy_c::LINK;
mVec3_c vec = mVec3_c::Ez * 78.f;
mAng3_c ang = mRotation;
@@ -172,7 +172,7 @@ void dAcOSeatSword_c::registerInEvent() {
vec.rotY(mRotation.y);
vec += mPosition;
player->setPosRot(&vec, &ang, 0, 1, 0);
mField_0x7E8.set(0);
field_0x7E8.set(0);
updateSwordMdl();
}
}
@@ -229,7 +229,7 @@ void dAcOSeatSword_c::actorExecuteCommon() {
mEffPos.y = mPosition.y;
mEff.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_76_, mEffPos, &mRotation, &mScale, nullptr, nullptr);
mEff.setGlobalAlpha(mField_0x7E4);
mEff.setGlobalAlpha(field_0x7E4);
}
void dAcOSeatSword_c::updateSwordMdl() {
@@ -237,7 +237,7 @@ void dAcOSeatSword_c::updateSwordMdl() {
mSwordMtx.copyFrom(mWorldMtx);
if (mSubtype == 1) {
mSwordMtx.XrotM(mField_0x7E8);
mSwordMtx.XrotM(field_0x7E8);
}
mMtx_c mtx;
src/REL/d/a/obj/d_a_obj_tubo.cpp
+59 -61
View File
@@ -83,7 +83,7 @@ int dAcOtubo_c::actorCreate() {
mAcceleration = -4.f;
mMaxSpeed = -40.f;
mbMovingForward = 0;
mField_0x9D8 = 2.f;
field_0x9D8 = 2.f;
mQuat_0x98C.set(1.f, 0.f, 0.f, 0.f);
mQuat_0x97C.set(1.f, 0.f, 0.f, 0.f);
@@ -140,7 +140,7 @@ int dAcOtubo_c::actorExecute() {
mStateMgr.executeState();
bool bOffGround = false;
if (mTimer_0x9F4 != 0) {
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
if (dBgS_ObjGndChk::CheckPos(mPosition + mVec3_c::Ey * 500.f)) {
if (dBgS_ObjGndChk::GetGroundHeight() - mPosition.y > 5.f) {
@@ -164,7 +164,7 @@ int dAcOtubo_c::actorExecute() {
calcVelocity();
mPosition += mVelocity;
mPosition += mStts.GetCcMove();
mField_0x9DC += mPosition.y - mOldPosition.y;
field_0x9DC += mPosition.y - mOldPosition.y;
adjustRoll();
}
getLinkage().bushTpFunc(mObjAcch);
@@ -177,7 +177,7 @@ int dAcOtubo_c::actorExecute() {
dCcS::GetInstance()->Set(&mSph);
getLinkage().fn_800511E0(this);
mField_0x8F0.modifyMtx();
field_0x8F0.modifyMtx();
calcRoll();
mMdl.setLocalMtx(mWorldMtx);
@@ -213,19 +213,17 @@ void dAcOtubo_c::initializeState_Wait() {}
void dAcOtubo_c::executeState_Wait() {
if (mObjAcch.ChkGroundLanding()) {
if (!mbField_0x9EF || !EventManager::isInEvent()) {
if (mField_0x9F6 == 2) {
dJEffManager_c::spawnGroundEffect(
mPosition, mPolyAttr0, mPolyAttr1, mField_0x1B4, 0, 1.0f, mField_0x1B0
);
if (field_0x9F6 == 2) {
dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.0f, field_0x1B0);
}
if (mbField_0x9F3) {
startSound(SE_Tubo_PUT);
mbField_0x9F3 = false;
}
if (checkOnLava()) {
if (mField_0x9F6 != 2) {
if (field_0x9F6 != 2) {
dJEffManager_c::spawnGroundEffect(
mPosition, mPolyAttr0, mPolyAttr1, mField_0x1B4, 0, 1.0f, mField_0x1B0
mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.0f, field_0x1B0
);
}
startSound(SE_O_FALL_LAVA_S);
@@ -247,7 +245,7 @@ void dAcOtubo_c::executeState_Wait() {
if (mSpeed < 1.f) {
mbMovingForward = 0;
sLib::chase(&mSpeed, 0.f, 0.05f);
mField_0x9D8 = 2.f;
field_0x9D8 = 2.f;
}
if (mSph.ChkAtSet()) {
@@ -262,7 +260,7 @@ void dAcOtubo_c::executeState_Wait() {
setActorProperty(AC_PROP_0x1);
}
}
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
}
fn_272_2670();
}
@@ -279,7 +277,7 @@ void dAcOtubo_c::initializeState_Grab() {
mbField_0x9EE = true;
}
mTimer_0x9F5 = 15;
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
}
void dAcOtubo_c::executeState_Grab() {
if (mbField_0x9ED && sLib::calcTimer(&mTimer_0x9F7) == 0) {
@@ -300,9 +298,9 @@ void dAcOtubo_c::executeState_Grab() {
} else {
if (!getLinkage().checkState(dLinkage_c::STATE_DELETE)) {
if (getLinkage().checkConnection(dLinkage_c::CONNECTION_5)) {
mField_0x9F6 = dLinkage_c::STATE_0;
field_0x9F6 = dLinkage_c::STATE_0;
} else {
mField_0x9F6 = getLinkage().getState();
field_0x9F6 = getLinkage().getState();
}
}
@@ -312,17 +310,17 @@ void dAcOtubo_c::executeState_Grab() {
}
}
void dAcOtubo_c::finalizeState_Grab() {
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
if (mSpeed > 0.f) {
mbMovingForward = 1;
}
mField_0x9D4 = cM::rndF(40.f);
field_0x9D4 = cM::rndF(40.f);
mSph.ClrCo_0x400();
if ((u8)getLinkage().mState == 2) {
mSph.OnAtSet();
}
mObjAcch.ClrRoofNone();
mObjAcch.mField_0x0D4 = 50.f;
mObjAcch.field_0x0D4 = 50.f;
}
void dAcOtubo_c::initializeState_Put() {}
@@ -353,15 +351,15 @@ void dAcOtubo_c::initializeState_Slope() {
mAngle.y = pla.GetAngleY();
}
mAng plaAng = pla.GetAngleY();
mField_0x9C4 = (plaAng - mAngle.y);
mAng other = labs((s16)(mAngle.y - mField_0x9C4));
mField_0x9C6 = nw4r::math::FSqrt(other.degree2() / 180.f) * 910.f;
field_0x9C4 = (plaAng - mAngle.y);
mAng other = labs((s16)(mAngle.y - field_0x9C4));
field_0x9C6 = nw4r::math::FSqrt(other.degree2() / 180.f) * 910.f;
}
void dAcOtubo_c::executeState_Slope() {
if (mObjAcch.ChkGroundLanding()) {
dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, mField_0x1B4, 0, 1.0f, mField_0x1B0);
dJEffManager_c::spawnGroundEffect(mPosition, mPolyAttr0, mPolyAttr1, field_0x1B4, 0, 1.0f, field_0x1B0);
} else if (mObjAcch.ChkGndHit()) {
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
addPickupTarget();
if (checkRollHitMaybe()) {
adjustAngle();
@@ -391,16 +389,16 @@ void dAcOtubo_c::finalizeState_Slope() {}
void dAcOtubo_c::initializeState_Rebirth() {
SpecialItemDropMgr *mgr = SpecialItemDropMgr::GetInstance();
mgr->giveSpecialDropItem(getParams2UpperByte(), mRoomID, &mPosition, 0, mRotation.y, -1);
mField_0x9AC = mPosition;
mpPosition = &mField_0x9AC;
mField_0x9F6 = 0;
field_0x9AC = mPosition;
mpPosition = &field_0x9AC;
field_0x9F6 = 0;
mRotation = mRotationCopy;
mQuat_0x98C.set(1.f, 0.f, 0.f, 0.f);
mSpeed = 0.f;
mVelocity.y = 0.f;
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
mSph.ClrCoSet();
mSph.ClrTgSet();
@@ -410,9 +408,9 @@ void dAcOtubo_c::initializeState_Rebirth() {
int item_drop_table = getParams2UpperByte();
switch (item_drop_table) {
default: break;
case SPECIAL_ITEM_11: mField_0x9FC = 2; break;
case SPECIAL_ITEM_12: mField_0x9FC = 0; break;
case SPECIAL_ITEM_13: mField_0x9FC = 1; break;
case SPECIAL_ITEM_11: field_0x9FC = 2; break;
case SPECIAL_ITEM_12: field_0x9FC = 0; break;
case SPECIAL_ITEM_13: field_0x9FC = 1; break;
}
mTimer_0x9E8 = 150;
unsetActorProperty(AC_PROP_0x1);
@@ -421,7 +419,7 @@ void dAcOtubo_c::executeState_Rebirth() {
setPosition(mPositionCopy);
mOldPosition = mPositionCopy;
u8 count = -1;
switch (mField_0x9FC) {
switch (field_0x9FC) {
case 2: count = dAcItem_c::getTotalBombCount(); break;
case 0: count = dAcItem_c::getTotalArrowCount(); break;
case 1: count = dAcItem_c::getTotalSeedCount(); break;
@@ -491,7 +489,7 @@ void dAcOtubo_c::calcRoll() {
mAngle.y = cM::atan2s(mVelocity.x, mVelocity.z);
}
f32 vel_mag = VEC3Len(mVelocity);
f32 f1 = mAng(vel_mag * (mField_0x9D4 + 200.f)).radian();
f32 f1 = mAng(vel_mag * (field_0x9D4 + 200.f)).radian();
f32 f2 = mAng(vel_mag * 182.0f * 0.2f).radian();
f32 f0 = mAng(mAngle.y - mRotation.y).radian();
@@ -533,13 +531,13 @@ void dAcOtubo_c::adjustRoll() {
vel.normalize();
vel.rotY(0x4000);
vel *= mField_0x9D8 * mField_0x9C8.sin();
vel *= field_0x9D8 * field_0x9C8.sin();
mAng old_9C8 = mField_0x9C8;
mField_0x9C8 += adj;
mAng old_9C8 = field_0x9C8;
field_0x9C8 += adj;
if (old_9C8.sin() * mField_0x9C8.sin() < 0.f) {
mField_0x9D8 *= 0.75f;
if (old_9C8.sin() * field_0x9C8.sin() < 0.f) {
field_0x9D8 *= 0.75f;
}
mPosition += vel;
@@ -547,16 +545,16 @@ void dAcOtubo_c::adjustRoll() {
void dAcOtubo_c::fn_272_2670() {
if (mbField_0x9EF && EventManager::isInEvent()) {
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
return;
}
if (mSph.ChkTgHit()) {
if (mSph.ChkTgAtHitType(AT_TYPE_BELLOWS | AT_TYPE_WIND)) {
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
if (mTimer_0x9F4 == 0) {
if (!mbField_0x9EB) {
mField_0x9D0 = cM::rndFX(0.25f) + 1.f;
field_0x9D0 = cM::rndFX(0.25f) + 1.f;
}
mbField_0x9EB = true;
fn_272_2E60(mSph.GetTgAtHitDir());
@@ -564,14 +562,14 @@ void dAcOtubo_c::fn_272_2670() {
}
}
} else {
if (mbField_0x9F1 && mField_0x8F0.fn_80051780(mSph)) {
mVelocity += mField_0x9B8;
if (mbField_0x9F1 && field_0x8F0.fn_80051780(mSph)) {
mVelocity += field_0x9B8;
mbField_0x9F1 = false;
}
static const s16 unk = {0}; // needed for rodata ordering
if (!cM::isZero(mField_0x9CA)) {
if (!cM::isZero(field_0x9CA)) {
mAngle.y = (*(s16 *)((u8 *)this + 0x9CA)); // HACK to force load again
mField_0x9CA.set(0);
field_0x9CA.set(0);
} else {
mQuat_c q;
q.set(1.f, 0.f, 0.f, 0.f);
@@ -581,7 +579,7 @@ void dAcOtubo_c::fn_272_2670() {
if (mObjAcch.ChkGndHit()) {
if (mYOffset >= 0.f && !checkCarryType()) {
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
} else if (checkInvalidGround()) {
mSpeed = 0.0f;
mbMovingForward = 0;
@@ -592,8 +590,8 @@ void dAcOtubo_c::fn_272_2670() {
if (fn_272_38C0()) {
fn_272_3020();
}
} else if (cM::isZero(mField_0x9E0)) {
mField_0x9E0 = 0.1f;
} else if (cM::isZero(field_0x9E0)) {
field_0x9E0 = 0.1f;
}
// the ordering is weird here
@@ -605,7 +603,7 @@ void dAcOtubo_c::fn_272_2670() {
if (checkSubmerged()) {
mAcceleration = -0.8f;
mMaxSpeed = -7.f;
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
cLib::addCalcPosXZ(&mVelocity, mVec3_c::Zero, 0.05f, 1.0f, 0.2f);
mSpeed = EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z);
if (!noSound) {
@@ -642,11 +640,11 @@ void dAcOtubo_c::attemptDestroy() {
}
if (mObjAcch.ChkGndHit() && mYOffset >= 0.f && !checkCarryType()) {
if ((mField_0x9DC < -100.f && !mbField_0x9EE) || fn_272_3660()) {
if ((field_0x9DC < -100.f && !mbField_0x9EE) || fn_272_3660()) {
destroy();
return;
}
mField_0x9DC = 0.f;
field_0x9DC = 0.f;
}
if (!mObjAcch.ChkGndHit() && mSph.ChkCoHit()) {
if (getLinkage().mState != 1 && mSpeed > 0.f) {
@@ -689,21 +687,21 @@ mVec3_c dAcOtubo_c::getCenter() const {
}
void dAcOtubo_c::fn_272_2E60(const mVec3_c &vel) {
if (mField_0x8F0.fn_80051780(mSph)) {
if (field_0x8F0.fn_80051780(mSph)) {
if (mSph.ChkCoHit()) {
mPosition += mStts.GetCcMove();
mField_0x8F0.fn_800051630();
field_0x8F0.fn_800051630();
}
mSpeed = 0.f;
mVelocity = mVec3_c::Zero;
mbField_0x9F1 = 1;
mField_0x9B8 = vel * 2.f;
field_0x9B8 = vel * 2.f;
} else if (mSph.ChkTgAtHitType(AT_TYPE_BELLOWS)) {
mVelocity.x += vel.x * 0.06f;
mVelocity.y += vel.y * 0.2f;
mVelocity.z += vel.z * 0.06f;
mField_0x9CA = cM::atan2s(vel.x, vel.z);
mSpeed = mField_0x9D0 * EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z);
field_0x9CA = cM::atan2s(vel.x, vel.z);
mSpeed = field_0x9D0 * EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z);
}
mbMovingForward = 1;
@@ -716,14 +714,14 @@ void dAcOtubo_c::fn_272_3020() {
static mVec3_c sRot = mVec3_c::Ey;
mQuat_c quat;
mVec3_c rot = mVec3_c::Ey + mVec3_c(0.f, 0.f, 1.f) * mField_0x9E0;
mVec3_c rot = mVec3_c::Ey + mVec3_c(0.f, 0.f, 1.f) * field_0x9E0;
rot.normalize();
rot.rotY(mField_0x9CC);
mField_0x9CC += 0x2000;
rot.rotY(field_0x9CC);
field_0x9CC += 0x2000;
quat.makeVectorRotation(sRot, rot);
sLib::chase(&mField_0x9E0, 0.f, 0.005f);
sLib::chase(&field_0x9E0, 0.f, 0.005f);
mQuat_0x99C.slerpTo(quat, 0.5f, mQuat_0x99C);
}
@@ -788,7 +786,7 @@ bool dAcOtubo_c::checkSlope() {
bool dAcOtubo_c::fn_272_3660() {
int poly_code = dBgS::GetInstance()->GetSpecialCode(mObjAcch.GetGnd());
return mField_0x9F6 == 2 && !mStateMgr.isState(StateID_Grab) && !checkSubmerged() && poly_code != POLY_ATTR_LAVA;
return field_0x9F6 == 2 && !mStateMgr.isState(StateID_Grab) && !checkSubmerged() && poly_code != POLY_ATTR_LAVA;
}
bool dAcOtubo_c::checkInvalidGround() {
@@ -815,7 +813,7 @@ bool dAcOtubo_c::checkSubmerged() {
}
bool dAcOtubo_c::fn_272_38A0() {
return mField_0x9DC < -30000.f;
return field_0x9DC < -30000.f;
}
bool dAcOtubo_c::fn_272_38C0() {
src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+25 -25
View File
@@ -65,17 +65,17 @@ int dAcOTumbleWeed_c::actorCreate() {
mAcceleration = -2.f;
mMaxSpeed = -40.f;
mField_0x974 = 0.0f;
mField_0x98B = true;
field_0x974 = 0.0f;
field_0x98B = true;
mWind = mVec3_c::Zero;
mSpeedTarget = cM::rndFX(2.5f) + 15.f;
mField_0x978 = cM::rndF(40.f);
mField_0x97C = cM::rndFX(0.25f) + 1.f;
field_0x978 = cM::rndF(40.f);
field_0x97C = cM::rndFX(0.25f) + 1.f;
mTumbleTimer = (150);
mField_0x910.set(1.f, 0.f, 0.f, 0.f);
field_0x910.set(1.f, 0.f, 0.f, 0.f);
mScale.set(1.f, 1.f, 1.f);
mStateMgr.changeState(StateID_Wait);
@@ -94,25 +94,25 @@ int dAcOTumbleWeed_c::doDelete() {
}
int dAcOTumbleWeed_c::actorExecute() {
if (!mField_0x98C && !checkStopped()) {
mField_0x968 = mVelocity;
mField_0x968.y = 0.0f;
mField_0x968.normalize();
mField_0x98C = true;
if (!field_0x98C && !checkStopped()) {
field_0x968 = mVelocity;
field_0x968.y = 0.0f;
field_0x968.normalize();
field_0x98C = true;
}
mStateMgr.executeState();
calcWind();
sLib::chase(&mField_0x980, 1.f, 0.1f);
dLightEnv_c::GetInstance().setWind(mField_0x968, mField_0x980);
sLib::chase(&field_0x980, 1.f, 0.1f);
dLightEnv_c::GetInstance().setWind(field_0x968, field_0x980);
calcVelocity();
mPosition += mVelocity;
mPosition += mStts.GetCcMove();
mObjAcch.CrrPos(*dBgS::GetInstance());
mField_0x974 += mPosition.y - mOldPosition.y;
field_0x974 += mPosition.y - mOldPosition.y;
if (checkCollect()) {
dAcPy_c::LINK->bugNetCollectTreasure(ITEM_TUMBLE_WEED);
killNoItemDrop();
@@ -124,7 +124,7 @@ int dAcOTumbleWeed_c::actorExecute() {
}
if (mSph.ChkTgHit() && mSph.ChkTgAtHitType(AT_TYPE_BELLOWS | AT_TYPE_WIND)) {
mField_0x974 = 0.f;
field_0x974 = 0.f;
adjustTumble(mSph.GetTgAtHitDir() * 0.06f);
}
adjustTimeScale();
@@ -177,13 +177,13 @@ void dAcOTumbleWeed_c::executeState_Wait() {
}
mVelocity.y = 0.f;
mField_0x974 = 0.f;
field_0x974 = 0.f;
if (checkSlope()) {
mStateMgr.changeState(StateID_Slope);
} else {
adjustSpeed();
if (mSpeed < 0.1f) {
mField_0x98B = false;
field_0x98B = false;
sLib::chase(&mSpeed, 0.f, 0.05f);
}
}
@@ -222,7 +222,7 @@ bool dAcOTumbleWeed_c::checkBreak() {
return true;
}
if (mObjAcch.ChkGndHit() && mField_0x974 < -300.f) {
if (mObjAcch.ChkGndHit() && field_0x974 < -300.f) {
return true;
}
@@ -238,7 +238,7 @@ bool dAcOTumbleWeed_c::checkBreak() {
}
bool dAcOTumbleWeed_c::fn_475_E40() const {
return mField_0x974 < -10000.f;
return field_0x974 < -10000.f;
}
bool dAcOTumbleWeed_c::checkSlope() {
@@ -268,9 +268,9 @@ void dAcOTumbleWeed_c::doBreak() {
}
void dAcOTumbleWeed_c::calcMatrix() {
if (mField_0x98B) {
if (field_0x98B) {
f32 vel_mag = VEC3Len(mVelocity);
f32 f1 = mAng(vel_mag * (mField_0x978 + 200.f)).radian();
f32 f1 = mAng(vel_mag * (field_0x978 + 200.f)).radian();
f32 f2 = mAng(vel_mag * 182.0f * 0.2f).radian();
f32 f0 = mAng(mAngle.y - mRotation.y).radian();
@@ -280,14 +280,14 @@ void dAcOTumbleWeed_c::calcMatrix() {
q3.setAxisRotation(mVec3_c::Ex, f1);
q2.setAxisRotation(mVec3_c::Ey, f2);
mField_0x910 = q1 * q3 * q2 * q0 * mField_0x910;
field_0x910 = q1 * q3 * q2 * q0 * field_0x910;
}
mMtx_c mtx0, mtx1, mtx2;
mShadowMtx.copyFrom(mWorldMtx);
mtx1.transS(getPosition() - mPosition);
mShadowMtx += mtx1;
mtx0.fromQuat(mField_0x910);
mtx0.fromQuat(field_0x910);
mtx2.transS(0.f, 40.f, 0.f);
mWorldMtx += mtx2;
mWorldMtx += mtx0;
@@ -358,12 +358,12 @@ void dAcOTumbleWeed_c::adjustTimeScale() {
}
void dAcOTumbleWeed_c::adjustTumble(const mVec3_c &dir) {
mField_0x98B = true;
field_0x98B = true;
mVelocity.x += dir.x;
mVelocity.z += dir.z;
mSpeed = mField_0x97C * EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z);
mSpeed = field_0x97C * EGG::Math<f32>::sqrt(mVelocity.x * mVelocity.x + mVelocity.z * mVelocity.z);
mAngle.y = mAng::fromVec(dir);
}
@@ -378,7 +378,7 @@ void dAcOTumbleWeed_c::calcWind() {
mSpeed = cM::rndFX(5.0f) + 15.f;
mWind = mVec3_c::Zero;
mField_0x980 = 0.f;
field_0x980 = 0.f;
}
}
src/d/a/d_a_item.cpp
+13 -13
View File
@@ -334,36 +334,36 @@ dAcItem_c::dAcItem_c()
mDowsingTarget(this, DowsingTarget::SLOT_NONE),
mItemQueuePrev(nullptr),
mItemQueueNext(nullptr) {
mField_0xCD8 = 1.0f;
field_0xCD8 = 1.0f;
mBaseScale = 1.0f;
mCurrentScale = 1.0f;
mField_0xCE4 = 1.0f;
mField_0xCE8 = 1.0f;
mField_0xCEC = 1.0f;
field_0xCE4 = 1.0f;
field_0xCE8 = 1.0f;
field_0xCEC = 1.0f;
mItemFlags = 0;
mField_0xD4C = 0;
field_0xD4C = 0;
mbNoDespawn = false;
mbNoGravity = false;
mField_0xD51 = 0;
mField_0xD56 = 0;
field_0xD51 = 0;
field_0xD56 = 0;
mbShowItemLighting = false;
mField_0xD62 = 0;
mField_0xD63 = 0;
mField_0xD65 = 0;
mField_0xD66 = 0;
field_0xD62 = 0;
field_0xD63 = 0;
field_0xD65 = 0;
field_0xD66 = 0;
sItemList.append(&mNode);
mTargetFiRelated = 3;
}
dAcItem_c::~dAcItem_c() {
delete mField_0xB3C;
delete field_0xB3C;
for (int i = 0; i < 2; i++) {
delete mField_0xB34[i];
delete field_0xB34[i];
}
mDowsingTarget.doUnregister();
}
src/d/a/obj/d_a_obj_tbox.cpp
+1 -1
View File
@@ -2655,7 +2655,7 @@ bool dAcTbox_c::checkForLinkBonk() {
}
int direction = 0;
mVec3_c diff = mVec3_c(linkPos.x - mCcD3.mField_0xA8.x, 0.0f, linkPos.z - mCcD3.mField_0xA8.z);
mVec3_c diff = mVec3_c(linkPos.x - mCcD3.field_0xA8.x, 0.0f, linkPos.z - mCcD3.field_0xA8.z);
if (VEC3LenSq(diff) <= FLT_EPSILON) {
return false;
}
src/d/col/bg/d_bg_s.cpp
+4 -4
View File
@@ -1009,11 +1009,11 @@ void dBgS::UpdateScrollTex() {
MapSrollText_t *scrollTex =
(MapSrollText_t *)OarcManager::GetInstance()->getData(common_folder, MAP_SCROLL_TEX_FILE);
for (int i = 0; i < 5; ++i, ++scrollTex) {
if (++mField_0x3864[i] >= scrollTex->mField_0x0E) {
mField_0x3864[i] = 0;
if (++field_0x3864[i] >= scrollTex->field_0x0E) {
field_0x3864[i] = 0;
}
if (++mField_0x3878[i] >= scrollTex->mField_0x10) {
mField_0x3878[i] = 0;
if (++field_0x3878[i] >= scrollTex->field_0x10) {
field_0x3878[i] = 0;
}
}
}
src/d/col/bg/d_bg_s_acch.cpp
+63 -63
View File
@@ -7,7 +7,7 @@
dBgS_AcchCir::dBgS_AcchCir() {
mWallRR = 0.0f;
mField_0x44 = 0.0f;
field_0x44 = 0.0f;
mWallH = 0.0f;
mWallR = 0.0f;
mWallHDirect = 0.0f;
@@ -45,36 +45,36 @@ dBgS_Acch::dBgS_Acch()
mpAngle(nullptr),
mpShapeAngle(nullptr),
mBgIndex(0),
mField_0x094(0),
mField_0x098(0),
field_0x094(0),
field_0x098(0),
mpMyObj(nullptr),
mTblSize(0),
mpAcchCir(nullptr),
mField_0x0A8(0.0f),
mField_0x0AC(0.0f),
field_0x0A8(0.0f),
field_0x0AC(0.0f),
mGroundHeight(-1e9f),
mField_0x0B4(120.0f),
mField_0x0C8(0.0f),
mField_0x0CC(0.0f),
field_0x0B4(120.0f),
field_0x0C8(0.0f),
field_0x0CC(0.0f),
mRoofHeight(1e9f),
mField_0x0D4(1.0f),
mField_0x0D8(0.0f),
field_0x0D4(1.0f),
field_0x0D8(0.0f),
mpOutPolyInfo(nullptr),
mRoofH_0x0E0(0.0f),
mGroundH_0x0E4(0.0f),
mField_0x0E8(1e9f),
mField_0x1D0(-1.0f),
mField_0x2F4(1000.0f),
mField_0x390(0),
mField_0x394(0) {
field_0x0E8(1e9f),
field_0x1D0(-1.0f),
field_0x2F4(1000.0f),
field_0x390(0),
field_0x394(0) {
SetPolyPassChk(GetPolyPassChkInfo());
SetGrpPassChk(GetGrpPassChkInfo());
SetRoofNone();
mRoof.mField_0x7C = 1;
mRoof.field_0x7C = 1;
mField_0x398.set(0.0f, 0.0f, 0.0f);
mField_0x3A4.set(0.0f, 0.0f, 0.0f);
field_0x398.set(0.0f, 0.0f, 0.0f);
field_0x3A4.set(0.0f, 0.0f, 0.0f);
}
dBgS_Acch::~dBgS_Acch() {}
@@ -101,7 +101,7 @@ void dBgS_Acch::Set(
mpShapeAngle = pShapeAngle;
mGroundHeight = mpPos->y;
mField_0x1A8.Init();
field_0x1A8.Init();
}
void dBgS_Acch::Set(dAcObjBase_c *pObj, int tblSize, dBgS_AcchCir *pAcchCir) {
@@ -159,7 +159,7 @@ void dBgS_Acch::GroundCheck(dBgS &bgs, bool param2) {
mVec3_c gnd_pos = *GetPos();
// This Ordering is weird
f32 temp = (mField_0x0B4 - mField_0x0A8) + mField_0x0AC;
f32 temp = (field_0x0B4 - field_0x0A8) + field_0x0AC;
if (mFlags & ACCH_FLAG_0x20000) {
if (temp <= 1.1f) {
temp = 1.1f;
@@ -193,14 +193,14 @@ void dBgS_Acch::GroundCheck(dBgS &bgs, bool param2) {
}
}
}
mField_0x0AC = 0.0f;
field_0x0AC = 0.0f;
if (gnd_pos.y > mRoofHeight) {
gnd_pos.y = mRoofHeight + 0.25f;
}
if (gnd_pos.y < mpPos->y + mField_0x0E8 &&
mpPos->y + mField_0x0E8 < (mField_0x0B4 - mField_0x0A8) + mField_0x0AC + mpPos->y) {
gnd_pos.y = mpPos->y + mField_0x0E8;
if (gnd_pos.y < mpPos->y + field_0x0E8 &&
mpPos->y + field_0x0E8 < (field_0x0B4 - field_0x0A8) + field_0x0AC + mpPos->y) {
gnd_pos.y = mpPos->y + field_0x0E8;
}
mGnd.SetExtChk(*this);
@@ -210,9 +210,9 @@ void dBgS_Acch::GroundCheck(dBgS &bgs, bool param2) {
Clr_0x10000000();
if (mGroundHeight != -1e9f) {
dBgS::GetInstance()->SetLightingCode(GetMyObj(), mGnd);
mField_0x0CC = mGroundHeight + mField_0x0A8;
if (mField_0x0CC > mField_0x0C8) {
mpPos->y = mField_0x0CC;
field_0x0CC = mGroundHeight + field_0x0A8;
if (field_0x0CC > field_0x0C8) {
mpPos->y = field_0x0CC;
if (ChkClrSpeedY() && mpSpeed) {
mpSpeed->y = 0.0f;
}
@@ -247,11 +247,11 @@ void dBgS_Acch::RoofCheck(dBgS &bgs) {
if (mGroundHeight == -1e9f) {
return;
}
if (mFlags & LINE_DOWN && mField_0x0CC > mField_0x0D8 &&
if (mFlags & LINE_DOWN && field_0x0CC > field_0x0D8 &&
(mGroundHeight <= mRoofHeight || cM3d_IsZero(mGroundHeight - mRoofHeight))) {
mpPos->y = (mGroundHeight + mRoofHeight) * 0.5f;
} else if (mpPos->y > mField_0x0D8 && mField_0x0D8 > mGroundHeight) {
mpPos->y = mField_0x0D8;
} else if (mpPos->y > field_0x0D8 && field_0x0D8 > mGroundHeight) {
mpPos->y = field_0x0D8;
}
if (mFlags & ROOF_NONE) {
return;
@@ -267,7 +267,7 @@ void dBgS_Acch::RoofCheck(dBgS &bgs) {
}
void dBgS_Acch::GroundRoofProc(dBgS &bgs, bool param2) {
mField_0x0D8 = 1e9f;
field_0x0D8 = 1e9f;
if (!(mFlags & ROOF_NONE)) {
mRoof.SetExtChk(*this);
ClrRoofHit();
@@ -277,11 +277,11 @@ void dBgS_Acch::GroundRoofProc(dBgS &bgs, bool param2) {
mRoofHeight = bgs.RoofChk(&mRoof);
if (mRoofHeight != 1e9f) {
if (mpPos->y + mField_0x0D4 > mRoofHeight) {
mField_0x0D8 = mRoofHeight - mField_0x0D4;
if (mpPos->y + field_0x0D4 > mRoofHeight) {
field_0x0D8 = mRoofHeight - field_0x0D4;
SetRoofHit();
} else if (mField_0x0C8 + mField_0x0D4 > mRoofHeight) {
mField_0x0D8 = mRoofHeight - mField_0x0D4;
} else if (field_0x0C8 + field_0x0D4 > mRoofHeight) {
field_0x0D8 = mRoofHeight - field_0x0D4;
SetRoofHit();
}
}
@@ -292,8 +292,8 @@ void dBgS_Acch::GroundRoofProc(dBgS &bgs, bool param2) {
GroundCheck(bgs, param2);
RoofCheck(bgs);
} else {
if (mField_0x0D8 < mpPos->y) {
mpPos->y = mField_0x0D8;
if (field_0x0D8 < mpPos->y) {
mpPos->y = field_0x0D8;
}
mFlags &= ~ACCH_FLAG_0x10000000;
mGroundHeight = -1e9f;
@@ -326,7 +326,7 @@ void dBgS_Acch::LineCheck(dBgS &bgs) {
}
cBgS_LinChk line;
mField_0x0E8 = 1e9f;
field_0x0E8 = 1e9f;
int i = 0;
do {
@@ -343,8 +343,8 @@ void dBgS_Acch::LineCheck(dBgS &bgs) {
cirWallH = (mGroundH_0x0E4 - old_pos.y) + 0.25f;
}
if (mField_0x0E8 > cirWallH) {
mField_0x0E8 = cirWallH;
if (field_0x0E8 > cirWallH) {
field_0x0E8 = cirWallH;
}
old_pos.y += cirWallH;
@@ -404,25 +404,25 @@ void dBgS_Acch::LineCheck(dBgS &bgs) {
extern "C" void *fn_80359C80(dBgS_SphChk *, cBgD_Vtx_t *, int, int, int, cM3dGPla *, void *);
void dBgS_Acch::SphCheck() {
f32 height = mField_0x1D0;
f32 height = field_0x1D0;
mSph.SetExtChk(*this);
mSph.mCallback = fn_80359C80;
if (height < 0.0f) {
height = 1e9f;
if (height > mField_0x0A8 && mField_0x0A8 > 0.0f) {
height = mField_0x0A8;
if (height > field_0x0A8 && field_0x0A8 > 0.0f) {
height = field_0x0A8;
}
if (height > mField_0x0D4 && mField_0x0D4 > 1.0f) {
height = mField_0x0D4;
if (height > field_0x0D4 && field_0x0D4 > 1.0f) {
height = field_0x0D4;
}
height *= 0.8f;
}
mSph.Set(mpPos, height);
mField_0x1A8.Init();
dBgS::GetInstance()->SphChk(&mSph, &mField_0x1A8);
mField_0x1A8.CalcPos(mpPos);
field_0x1A8.Init();
dBgS::GetInstance()->SphChk(&mSph, &field_0x1A8);
field_0x1A8.CalcPos(mpPos);
}
void dBgS_Acch::CrrPos(dBgS &bgs) {
@@ -430,7 +430,7 @@ void dBgS_Acch::CrrPos(dBgS &bgs) {
bgs.MoveBgCrrPos(mGnd, ChkGroundHit(), mpPos, mpAngle, mpShapeAngle, false, false);
GroundCheckInit(bgs);
u32 prev = mField_0x394;
u32 prev = field_0x394;
Init();
@@ -485,8 +485,8 @@ void dBgS_Acch::CalcWallBmdCyl() {
}
void dBgS_Acch::SetGroundUpY(f32 param_0) {
mField_0x0AC = param_0 - mField_0x0A8;
mField_0x0A8 = param_0;
field_0x0AC = param_0 - field_0x0A8;
field_0x0A8 = param_0;
}
bool dBgS_Acch::fn_80340ca0(cBgS_PolyInfo &info) const {
@@ -589,29 +589,29 @@ dBgS_AcchCir &dBgS_Acch::GetCir(int idx) {
void dBgS_Acch::fn_80340f70(const mVec3_c *pVec) {
bool adjusted = false;
if (mField_0x398.x > pVec->x) {
mField_0x398.x = pVec->x;
if (field_0x398.x > pVec->x) {
field_0x398.x = pVec->x;
adjusted = true;
} else if (mField_0x3A4.x < pVec->x) {
mField_0x3A4.x = pVec->x;
} else if (field_0x3A4.x < pVec->x) {
field_0x3A4.x = pVec->x;
adjusted = true;
}
if (mField_0x398.z > pVec->z) {
mField_0x398.z = pVec->z;
if (field_0x398.z > pVec->z) {
field_0x398.z = pVec->z;
adjusted = true;
} else if (mField_0x3A4.z < pVec->z) {
mField_0x3A4.z = pVec->z;
} else if (field_0x3A4.z < pVec->z) {
field_0x3A4.z = pVec->z;
adjusted = true;
}
if (!adjusted && mField_0x394 > 0) {
mField_0x394--;
if (!adjusted && field_0x394 > 0) {
field_0x394--;
}
}
void dBgS_Acch::fn_80341000() {
mpPos->x += mField_0x398.x + mField_0x3A4.x;
mpPos->z += mField_0x398.z + mField_0x3A4.z;
mpPos->x += field_0x398.x + field_0x3A4.x;
mpPos->z += field_0x398.z + field_0x3A4.z;
}
dBgS_ObjAcch::dBgS_ObjAcch() {
src/d/col/bg/d_bg_s_poly_pass_chk.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ dBgS_PolyPassChk::dBgS_PolyPassChk() {
mClawshot = false;
mUnderwaterRoof = false;
mBellows = false;
mField_0xE = false;
field_0xE = false;
}
dBgS_PolyPassChk::~dBgS_PolyPassChk() {}
src/d/col/bg/d_bg_s_roof_chk.cpp
+1 -1
View File
@@ -8,7 +8,7 @@ f32 dBgS_ObjRoofChk::sRoofHeight;
dBgS_RoofChk::dBgS_RoofChk() {
mPos.set(0.0f, 0.0f, 0.0f);
mNowY = 0.0f;
mField_0x7C = 1;
field_0x7C = 1;
mPosCopy.set(0.0f, 0.0f, 0.0f);
SetPolyPassChk(GetPolyPassChkInfo());
src/d/col/bg/d_bg_s_sph_chk.cpp
+2 -2
View File
@@ -1,8 +1,8 @@
#include "d/col/bg/d_bg_s_sph_chk.h"
dBgS_SphChk::dBgS_SphChk() {
mField_0x80 = 0.0f;
mField_0x84.set(0.0f, 0.0f, 0.0f);
field_0x80 = 0.0f;
field_0x84.set(0.0f, 0.0f, 0.0f);
SetInfo(600, 0, 0);
src/d/col/bg/d_bg_w_base.cpp
+2 -2
View File
@@ -67,7 +67,7 @@ BOOL dBgW_Base::InitMapStuff(mAllocator_c *pAllocator) {
}
bool dBgW_Base::fn_8034AD70() const {
u8 val = mField_0x18.field_0x00;
u8 val = field_0x18.field_0x00;
if (val == 0 || val == 2) {
return true;
}
@@ -75,7 +75,7 @@ bool dBgW_Base::fn_8034AD70() const {
}
bool dBgW_Base::fn_8034ADA0() const {
return mField_0x18.field_0x00 <= 1;
return field_0x18.field_0x00 <= 1;
}
bool dBgW_Base::UpdateDraw(mAllocator_c * /* unused */) {
src/d/col/bg/d_bg_w_sv.cpp
+3 -3
View File
@@ -17,7 +17,7 @@ bool dBgWSv::Set(cBgD_t *pDzb, PLC *pPlc, u32 p3, bool p4) {
return true;
}
mField_0x214 = p3;
field_0x214 = p3;
if (p3 & 1) {
return false;
}
@@ -83,7 +83,7 @@ bool dBgWSv::CrrPosWork(mVec3_c *pPos, int vtx0, int vtx1, int vtx2) {
void dBgWSv::CrrPos(
cBgS_PolyInfo const &info, void *pObj, bool b, mVec3_c *pPos, mAng3_c *pAngle, mAng3_c *pShapeAngle
) {
if (mField_0x214 & 1) {
if (field_0x214 & 1) {
return;
}
@@ -161,7 +161,7 @@ bool dBgWSv::TransPosWork(mVec3_c *pPos, int vtx0, int vtx1, int vtx2) {
void dBgWSv::TransPos(
cBgS_PolyInfo const &info, void *pObj, bool b, mVec3_c *pPos, mAng3_c *pAngle, mAng3_c *pShapeAngle
) {
if (mField_0x214 & 1) {
if (field_0x214 & 1) {
return;
}
src/d/col/bg/d_bg_w_time.cpp
+2 -2
View File
@@ -179,8 +179,8 @@ bool dBgWTime::SphChk(dBgS_SphChk *pSph, void *pDat) {
sVtx[2].y = c.y;
sVtx[2].z = c.z;
pla = pSph->GetPlane();
pSph->mField_0x80 = dist;
pSph->mField_0x84.set(adj.x, adj.y, adj.z);
pSph->field_0x80 = dist;
pSph->field_0x84.set(adj.x, adj.y, adj.z);
pSph->mCallback(pSph, sVtx, 0, 1, 2, &pla, pDat);
return true;
}
src/d/col/c/c_bg_s_chk.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include "d/col/c/c_bg_s_chk.h"
cBgS_Chk::cBgS_Chk()
: mPolyPassChk(nullptr), mGrpPassChk(nullptr), mActorId(0), mField_0x0C(0), mField_0x0E(1), mField_0x10(1) {}
: mPolyPassChk(nullptr), mGrpPassChk(nullptr), mActorId(0), field_0x0C(0), field_0x0E(1), field_0x10(1) {}
cBgS_Chk::~cBgS_Chk() {}
src/d/col/c/c_bg_s_gnd_chk.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
cBgS_GndChk::cBgS_GndChk() {
mPos = mVec3_c::Zero;
mField_0x74 = 1;
field_0x74 = 1;
}
cBgS_GndChk::~cBgS_GndChk() {}
src/d/col/c/c_bg_s_lin_chk.cpp
+2 -2
View File
@@ -9,7 +9,7 @@ cBgS_LinChk::~cBgS_LinChk() {}
void cBgS_LinChk::Ct() {
mVec3_c set = mVec3_c::Zero;
mLin.Set(set, set);
mField_0x6C = set;
field_0x6C = set;
mPreRoofChk = false;
mPreWallChk = false;
mPreGroundChk = false;
@@ -20,7 +20,7 @@ void cBgS_LinChk::Ct() {
void cBgS_LinChk::Set2(const mVec3_c &start, const mVec3_c &end, u32 id) {
mLin.Set(start, end);
mField_0x6C = end;
field_0x6C = end;
mActorId = id;
mHit = false;
ClearPi();
src/d/col/c/c_cc_d.cpp
+61 -61
View File
@@ -201,32 +201,32 @@ int cCcD_Stts::GetID() const {
}
void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) {
if (mField_0x10.x > x) {
mField_0x10.x = x;
} else if (mField_0x1C.x < x) {
mField_0x1C.x = x;
if (field_0x10.x > x) {
field_0x10.x = x;
} else if (field_0x1C.x < x) {
field_0x1C.x = x;
}
if (mField_0x10.y > y) {
mField_0x10.y = y;
} else if (mField_0x1C.y < y) {
mField_0x1C.y = y;
if (field_0x10.y > y) {
field_0x10.y = y;
} else if (field_0x1C.y < y) {
field_0x1C.y = y;
}
if (mField_0x10.z > z) {
mField_0x10.z = z;
} else if (mField_0x1C.z < z) {
mField_0x1C.z = z;
if (field_0x10.z > z) {
field_0x10.z = z;
} else if (field_0x1C.z < z) {
field_0x1C.z = z;
}
mCcMove.x = mField_0x10.x + mField_0x1C.x;
mCcMove.y = mField_0x10.y + mField_0x1C.y;
mCcMove.z = mField_0x10.z + mField_0x1C.z;
mCcMove.x = field_0x10.x + field_0x1C.x;
mCcMove.y = field_0x10.y + field_0x1C.y;
mCcMove.z = field_0x10.z + field_0x1C.z;
}
void cCcD_Stts::ClrCcMove() {
mField_0x10 = mVec3_c::Zero;
mField_0x1C = mVec3_c::Zero;
field_0x10 = mVec3_c::Zero;
field_0x1C = mVec3_c::Zero;
mCcMove = mVec3_c::Zero;
}
@@ -309,7 +309,7 @@ void cCcD_GAtTgCoCommonBase::SubtractEffCounter() {
// Collision Object
///////////////////////////////////////////////////////////////////////////////
cCcD_Obj::cCcD_Obj() : mStts(0), mField_0x108(0) {}
cCcD_Obj::cCcD_Obj() : mStts(0), field_0x108(0) {}
cCcD_Obj::~cCcD_Obj() {
mStts = 0;
@@ -487,11 +487,11 @@ bool cCcD_Obj::ChkTgBit25() const {
}
u16 cCcD_Obj::GetTgSoundID() const {
return mTg.mAtHitSrc.mField_0x10;
return mTg.mAtHitSrc.field_0x10;
}
s16 cCcD_Obj::GetTg_0x6A() const {
return mTg.mAtHitSrc.mField_0x12;
return mTg.mAtHitSrc.field_0x12;
}
bool cCcD_Obj::ChkTgBit8() const {
@@ -499,7 +499,7 @@ bool cCcD_Obj::ChkTgBit8() const {
}
u8 cCcD_Obj::GetTg_0x4A() const {
return mTg.mField_0x4A;
return mTg.field_0x4A;
}
dAcObjBase_c *cCcD_Obj::GetTgActor() {
@@ -546,10 +546,10 @@ bool cCcD_ShapeAttr::Calc(const mVec3_c &, const mVec3_c &, mVec3_c *pOut) {
}
void cCcD_ShapeAttr::GetShapeAccess(cCcD_ShapeAttr::Shape *pShape) const {
pShape->mField_0x00 = 4;
pShape->mField_0x04 = mVec3_c::Zero;
pShape->mField_0x10 = mVec3_c::Zero;
pShape->mField_0x1C = mVec3_c::Zero;
pShape->field_0x00 = 4;
pShape->field_0x04 = mVec3_c::Zero;
pShape->field_0x10 = mVec3_c::Zero;
pShape->field_0x1C = mVec3_c::Zero;
}
bool cCcD_ShapeAttr::GetPosBool(mVec3_c *pOut) const {
@@ -698,10 +698,10 @@ bool cCcD_TriAttr::GetNVec(const mVec3_c &pnt, mVec3_c *pOut) const {
}
void cCcD_TriAttr::GetShapeAccess(cCcD_ShapeAttr::Shape *pShape) const {
pShape->mField_0x00 = SHAPE_TRIANGLE;
pShape->mField_0x04 = GetPntA();
pShape->mField_0x10 = GetPntB();
pShape->mField_0x1C = GetPntC();
pShape->field_0x00 = SHAPE_TRIANGLE;
pShape->field_0x04 = GetPntA();
pShape->field_0x10 = GetPntB();
pShape->field_0x1C = GetPntC();
}
void cCcD_TriAttr::GetPos(nw4r::math::VEC3 *pOut) const {
@@ -797,8 +797,8 @@ bool cCcD_UnkAttr::CrossCo(cCcD_CpsAttr &cpsAttr, f32 *pOut) {
mVec3_c pos;
if (cM3dGUnk::Cross(cpsAttr, &pos)) {
cpsAttr.SetVirtCenter(&pos);
*pOut = cpsAttr.CrossCoCommon(*this, mField_0xC4);
mField_0xC4 = 0.0f;
*pOut = cpsAttr.CrossCoCommon(*this, field_0xC4);
field_0xC4 = 0.0f;
}
return false;
}
@@ -1034,9 +1034,9 @@ bool cCcD_CpsAttr::CrossAtTg(cCcD_UnkAttr &unkAttr, mVec3_c *pOut) {
}
void cCcD_CpsAttr::SetVirtCenter(mVec3_c *pOut) {
if (mField_0x20) {
if (field_0x20) {
mVirtCenter = *pOut;
mField_0x20 = 0;
field_0x20 = 0;
} else {
f32 dist = cM3d_lineVsPosSuisenCross(*this, *pOut, &mVirtCenter);
if (dist < 0.f) {
@@ -1049,7 +1049,7 @@ void cCcD_CpsAttr::SetVirtCenter(mVec3_c *pOut) {
f32 cCcD_CpsAttr::CrossCoCommon(cCcD_ShapeAttr &attr, f32 r) {
mVec3_c tmp = mVirtCenter - attr.GetCoP();
f32 mag = (r + mField_0x1C) - EGG::Math<f32>::sqrt(tmp.x * tmp.x + tmp.z * tmp.z);
f32 mag = (r + field_0x1C) - EGG::Math<f32>::sqrt(tmp.x * tmp.x + tmp.z * tmp.z);
if (mag < 0.0f) {
mag = 0.0f;
@@ -1063,7 +1063,7 @@ bool cCcD_CpsAttr::CrossCo(cCcD_CpsAttr &cpsAttr, f32 *pOut) {
if (cM3d_Cross_CpsCps(*this, cpsAttr, &pos, nullptr, nullptr)) {
SetVirtCenter(&pos);
cpsAttr.SetVirtCenter(&pos);
*pOut = CrossCoCommon(cpsAttr, cpsAttr.mField_0x1C);
*pOut = CrossCoCommon(cpsAttr, cpsAttr.field_0x1C);
cpsAttr.Set_0x1C(cpsAttr.GetR());
return true;
}
@@ -1095,8 +1095,8 @@ bool cCcD_CpsAttr::CrossCo(cCcD_UnkAttr &unkAttr, f32 *pOut) {
mVec3_c pos;
if (cM3dGCps::Cross(unkAttr, &pos)) {
SetVirtCenter(&pos);
*pOut = CrossCoCommon(unkAttr, unkAttr.mField_0xC4);
unkAttr.mField_0xC4 = 0.0f;
*pOut = CrossCoCommon(unkAttr, unkAttr.field_0xC4);
unkAttr.field_0xC4 = 0.0f;
return true;
}
return false;
@@ -1145,10 +1145,10 @@ void cCcD_CpsAttr::GetPos(nw4r::math::VEC3 *pOut) const {
}
void cCcD_CpsAttr::GetShapeAccess(cCcD_ShapeAttr::Shape *pShape) const {
pShape->mField_0x00 = SHAPE_CAPSULE;
pShape->mField_0x04 = GetStart();
pShape->mField_0x10 = GetEnd();
pShape->mField_0x1C.set(GetR(), 0.f, 0.f);
pShape->field_0x00 = SHAPE_CAPSULE;
pShape->field_0x04 = GetStart();
pShape->field_0x10 = GetEnd();
pShape->field_0x1C.set(GetR(), 0.f, 0.f);
}
void cCcD_CpsAttr::TranslateXZ(f32 x, f32 z) {
@@ -1277,10 +1277,10 @@ bool cCcD_CylAttr::GetNVec(const mVec3_c &param0, mVec3_c *pOut) const {
}
void cCcD_CylAttr::GetShapeAccess(cCcD_ShapeAttr::Shape *pShape) const {
pShape->mField_0x00 = SHAPE_CYLINDER;
pShape->mField_0x04 = GetC();
pShape->mField_0x10 = mVec3_c::Zero;
pShape->mField_0x1C.set(GetR(), GetH(), 0.f);
pShape->field_0x00 = SHAPE_CYLINDER;
pShape->field_0x04 = GetC();
pShape->field_0x10 = mVec3_c::Zero;
pShape->field_0x1C.set(GetR(), GetH(), 0.f);
}
void cCcD_CylAttr::GetPos(nw4r::math::VEC3 *pOut) const {
@@ -1403,10 +1403,10 @@ bool cCcD_SphAttr::GetNVec(const mVec3_c &param0, mVec3_c *param1) const {
}
void cCcD_SphAttr::GetShapeAccess(cCcD_ShapeAttr::Shape *pShape) const {
pShape->mField_0x00 = SHAPE_SPHERE;
pShape->mField_0x04 = GetC();
pShape->mField_0x10 = mVec3_c::Zero;
pShape->mField_0x1C.set(GetR(), 0.0f, 0.0f);
pShape->field_0x00 = SHAPE_SPHERE;
pShape->field_0x04 = GetC();
pShape->field_0x10 = mVec3_c::Zero;
pShape->field_0x1C.set(GetR(), 0.0f, 0.0f);
}
void cCcD_SphAttr::GetPos(nw4r::math::VEC3 *pPos) const {
@@ -1428,7 +1428,7 @@ void cCcD_SphAttr::TranslateXZ(f32 x, f32 z) {
///////////////////////////////////////////////////////////////////////////////
cCcD_ObjAt::cCcD_ObjAt() {
mField_0x58 = 0;
field_0x58 = 0;
}
cCcD_ObjAt::~cCcD_ObjAt() {}
@@ -1450,20 +1450,20 @@ 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) {}
field_0x4A(0),
field_0x4B(0),
field_0x4C(0),
field_0x50(0),
field_0x54(0),
field_0x6C(0.f, 0.f, 0.f),
field_0x78(0) {}
cCcD_ObjTg::~cCcD_ObjTg() {}
void cCcD_ObjTg::Set(const cCcD_SrcGObjTg &src) {
mEffCounter = 0;
mSrc = src;
mField_0x4C = 0;
field_0x4C = 0;
mHitPos = mVec3_c::Zero;
mShieldFrontRangeYAngle = nullptr;
mShieldRange = 0x4000;
@@ -1473,13 +1473,13 @@ void cCcD_ObjTg::AdjustHitPos(f32 x, f32 z) {
mHitPos.x += x;
mHitPos.z += z;
mField_0x6C.x += x;
mField_0x6C.z += z;
field_0x6C.x += x;
field_0x6C.z += z;
}
cCcD_ObjCo::cCcD_ObjCo() {
mGrp = 0;
mField_0x28_callback = 0;
field_0x28_callback = 0;
}
cCcD_ObjCo::~cCcD_ObjCo() {}
src/d/col/c/c_m3d_g_cps.cpp
+6 -4
View File
@@ -1,11 +1,13 @@
#include "d/col/c/c_m3d_g_cps.h"
#include "d/col/c/c_m3d.h"
#include "nw4r/math.h" // IWYU pragma: export
cM3dGCps::cM3dGCps() {
mField_0x1C = 0.0f;
mField_0x20 = 0;
field_0x1C = 0.0f;
field_0x20 = 0;
mFlags = 0;
}
@@ -14,11 +16,11 @@ void cM3dGCps::SetR(f32 r) {
r = 0.0f;
}
mRadius = r;
mField_0x1C = (double)r; // huh
field_0x1C = (double)r; // huh
}
void cM3dGCps::Set_0x1C(f32 f) {
mField_0x1C = f;
field_0x1C = f;
}
void cM3dGCps::Set(const mVec3_c &start, const mVec3_c &end, f32 r) {
src/d/col/c/c_m3d_g_unk.cpp
+8 -8
View File
@@ -10,12 +10,12 @@ cM3dGUnk::cM3dGUnk() {
mMax.set(0.0f, 0.0f, 0.0f);
mLin.GetStart().set(0.0f, 0.0f, 0.0f);
mLin.GetEnd().set(0.0f, 0.0f, 0.0f);
mField_0x90.set(0.0f, 0.0f, 0.0f);
mField_0x9C.set(0.0f, 0.0f, 0.0f);
mField_0xA8.set(0.0f, 0.0f, 0.0f);
mField_0xB4 = 0;
field_0x90.set(0.0f, 0.0f, 0.0f);
field_0x9C.set(0.0f, 0.0f, 0.0f);
field_0xA8.set(0.0f, 0.0f, 0.0f);
field_0xB4 = 0;
mVirtCenter.set(0.0f, 0.0f, 0.0f);
mField_0xC4 = 0.0f;
field_0xC4 = 0.0f;
PSMTXIdentity(mMtx);
PSMTXIdentity(mInvMtx);
}
@@ -25,9 +25,9 @@ void cM3dGUnk::Set(const mVec3_c &vA, const mVec3_c &vB) {
mMax = vB;
mLin.GetEnd() = (mMin + mMax) * 0.5f;
mField_0x90 = mMin - mLin.GetEnd();
mField_0x9C = mMax - mLin.GetEnd();
mField_0xA8 = (mMax - mMin) * 0.5f;
field_0x90 = mMin - mLin.GetEnd();
field_0x9C = mMax - mLin.GetEnd();
field_0xA8 = (mMax - mMin) * 0.5f;
Update();
}