mirror of
https://github.com/zeldaret/tww.git
synced 2026-07-13 23:05:09 -04:00
Misc fixes
This commit is contained in:
+6
-6
@@ -68,7 +68,7 @@ struct dCcD_SrcCps {
|
||||
class dCcD_GStts : public cCcD_GStts {
|
||||
public:
|
||||
dCcD_GStts();
|
||||
virtual ~dCcD_GStts();
|
||||
virtual ~dCcD_GStts() {}
|
||||
|
||||
void Ct();
|
||||
void Move();
|
||||
@@ -108,7 +108,7 @@ public:
|
||||
virtual void Ct();
|
||||
virtual void ClrAt();
|
||||
virtual void ClrTg();
|
||||
virtual ~dCcD_Stts();
|
||||
virtual ~dCcD_Stts() {}
|
||||
|
||||
}; // Size = 0x3C
|
||||
|
||||
@@ -140,7 +140,7 @@ public:
|
||||
void SetEffCounterTimer();
|
||||
void SubtractEffCounter() { mEffCounter -= 1; }
|
||||
bool ChkEffCounter() { return mEffCounter >= 0; }
|
||||
virtual ~dCcD_GAtTgCoCommonBase();
|
||||
virtual ~dCcD_GAtTgCoCommonBase() {}
|
||||
|
||||
void ClrEffCounter() { mEffCounter = 0; }
|
||||
u32 GetGFlag() const { return mGFlag; }
|
||||
@@ -161,7 +161,7 @@ public:
|
||||
class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
void Set(dCcD_SrcGObjAt const&);
|
||||
virtual ~dCcD_GObjAt();
|
||||
virtual ~dCcD_GObjAt() {}
|
||||
void SetVec(cXyz& vec) { mVec = vec; }
|
||||
cXyz& GetVec() { return mVec; }
|
||||
cXyz* GetVecP() { return &mVec; }
|
||||
@@ -192,7 +192,7 @@ public:
|
||||
class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
void Set(dCcD_SrcGObjTg const&);
|
||||
virtual ~dCcD_GObjTg();
|
||||
virtual ~dCcD_GObjTg() {}
|
||||
void SetSe(u8 se) { mSe = se; }
|
||||
void SetVec(cXyz& vec) { mVec = vec; }
|
||||
cXyz& GetVec() { return mVec; }
|
||||
@@ -222,7 +222,7 @@ private:
|
||||
// Correction (Co) Collider
|
||||
class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase {
|
||||
public:
|
||||
virtual ~dCcD_GObjCo();
|
||||
virtual ~dCcD_GObjCo() {}
|
||||
void Set(dCcD_SrcGObjCo const& pSrc) { dCcD_GAtTgCoCommonBase::Set(pSrc.mBase); }
|
||||
}; // Size = 0x1C ?
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ public:
|
||||
|
||||
STATIC_ASSERT(sizeof(dPa_followEcallBack) == 0x14);
|
||||
|
||||
class dPa_smokeEcallBack : dPa_followEcallBack {
|
||||
class dPa_smokeEcallBack : public dPa_followEcallBack {
|
||||
public:
|
||||
dPa_smokeEcallBack(u8);
|
||||
virtual ~dPa_smokeEcallBack();
|
||||
|
||||
@@ -172,8 +172,10 @@ class JntHit_c;
|
||||
|
||||
struct fopAc_cullSizeSphere {
|
||||
public:
|
||||
#ifndef __INTELLISENSE__
|
||||
fopAc_cullSizeSphere() {}
|
||||
fopAc_cullSizeSphere(cXyz, float);
|
||||
#endif
|
||||
|
||||
/* 0x0 */ Vec mCenter;
|
||||
/* 0xC */ f32 mRadius;
|
||||
@@ -181,9 +183,11 @@ public:
|
||||
|
||||
struct fopAc_cullSizeBox {
|
||||
public:
|
||||
#ifndef __INTELLISENSE__
|
||||
fopAc_cullSizeBox() {}
|
||||
fopAc_cullSizeBox(const fopAc_cullSizeBox&);
|
||||
fopAc_cullSizeBox(cXyz, cXyz);
|
||||
#endif
|
||||
|
||||
/* 0x0 */ Vec mMin;
|
||||
/* 0xC */ Vec mMax;
|
||||
|
||||
@@ -274,7 +274,7 @@ void daArrow_c::arrowShooting() {
|
||||
setArrowShootSe();
|
||||
|
||||
if (mArrowType == TYPE_LIGHT && !mbShotByZelda) {
|
||||
if (strcmp(dComIfGp_getStartStageName(), "GanonK") != 0) {
|
||||
if (strcmp(dComIfGp_getStartStageName(), "GanonK") != 0) {
|
||||
// Not in Puppet Ganon's boss room.
|
||||
mCps.SetAtSpl((dCcG_At_Spl)0xB);
|
||||
}
|
||||
|
||||
@@ -558,8 +558,8 @@ namespace daObjMovebox {
|
||||
} else {
|
||||
numPnts = 4;
|
||||
}
|
||||
if (numPnts > mPath->mNum) {
|
||||
numPnts = mPath->mNum;
|
||||
if (numPnts > mPath->m_num) {
|
||||
numPnts = mPath->m_num;
|
||||
}
|
||||
|
||||
s32 pntIdx;
|
||||
|
||||
@@ -97,11 +97,6 @@ dCcD_GObjInf::dCcD_GObjInf() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AB63C-800AB7C0 .text __dt__12dCcD_GObjInfFv */
|
||||
dCcD_GObjInf::~dCcD_GObjInf() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AB7C0-800AB7C4 .text GetGObjInf__12dCcD_GObjInfFv */
|
||||
cCcD_GObjInf* dCcD_GObjInf::GetGObjInf() {
|
||||
return (cCcD_GObjInf*)this;
|
||||
@@ -268,106 +263,6 @@ void dCcD_Sph::MoveCAt(cXyz&) {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
// /* 800AC0E8-800AC130 .text __dt__10cCcD_GSttsFv */
|
||||
// cCcD_GStts::~cCcD_GStts() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC130-800AC228 .text __dt__12cCcD_GObjInfFv */
|
||||
// cCcD_GObjInf::~cCcD_GObjInf() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC228-800AC310 .text __dt__8cCcD_ObjFv */
|
||||
// cCcD_Obj::~cCcD_Obj() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC310-800AC3D0 .text __dt__14cCcD_ObjHitInfFv */
|
||||
// cCcD_ObjHitInf::~cCcD_ObjHitInf() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC3D0-800AC42C .text __dt__10cCcD_ObjCoFv */
|
||||
// cCcD_ObjCo::~cCcD_ObjCo() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC42C-800AC488 .text __dt__10cCcD_ObjTgFv */
|
||||
// cCcD_ObjTg::~cCcD_ObjTg() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC488-800AC4E4 .text __dt__10cCcD_ObjAtFv */
|
||||
// cCcD_ObjAt::~cCcD_ObjAt() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC4E4-800AC52C .text __dt__18cCcD_ObjCommonBaseFv */
|
||||
// cCcD_ObjCommonBase::~cCcD_ObjCommonBase() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC52C-800AC534 .text GetGObjInf__8cCcD_ObjFv */
|
||||
// cCcD_GObjInf* cCcD_Obj::GetGObjInf() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC534-800AC538 .text GetGObjInf__12cCcD_GObjInfCFv */
|
||||
// cCcD_GObjInf const* cCcD_GObjInf::GetGObjInf() const {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC538-800AC540 .text GetShapeAttr__8cCcD_ObjCFv */
|
||||
// cCcD_ShapeAttr const* cCcD_Obj::GetShapeAttr() const {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC540-800AC558 .text ClrAtHit__12cCcD_GObjInfFv */
|
||||
// void cCcD_GObjInf::ClrAtHit() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC558-800AC570 .text ClrTgHit__12cCcD_GObjInfFv */
|
||||
// void cCcD_GObjInf::ClrTgHit() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC570-800AC588 .text ClrCoHit__12cCcD_GObjInfFv */
|
||||
// void cCcD_GObjInf::ClrCoHit() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC588-800AC58C .text GetGObjInf__12cCcD_GObjInfFv */
|
||||
// cCcD_GObjInf* cCcD_GObjInf::GetGObjInf() {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
// /* 800AC58C-800AC594 .text GetGObjInf__8cCcD_ObjCFv */
|
||||
// cCcD_GObjInf const* cCcD_Obj::GetGObjInf() const {
|
||||
// /* Nonmatching */
|
||||
// }
|
||||
|
||||
/* 800AC594-800AC5F0 .text __dt__11dCcD_GObjCoFv */
|
||||
dCcD_GObjCo::~dCcD_GObjCo() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AC5F0-800AC64C .text __dt__11dCcD_GObjTgFv */
|
||||
dCcD_GObjTg::~dCcD_GObjTg() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AC64C-800AC6A8 .text __dt__11dCcD_GObjAtFv */
|
||||
dCcD_GObjAt::~dCcD_GObjAt() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AC6A8-800AC6F0 .text __dt__22dCcD_GAtTgCoCommonBaseFv */
|
||||
dCcD_GAtTgCoCommonBase::~dCcD_GAtTgCoCommonBase() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AC6F0-800AC700 .text GetGStts__9dCcD_SttsFv */
|
||||
cCcD_GStts* dCcD_Stts::GetGStts() {
|
||||
/* Nonmatching */
|
||||
@@ -382,13 +277,3 @@ void dCcD_Stts::ClrAt() {
|
||||
void dCcD_Stts::ClrTg() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AC71C-800AC7AC .text __dt__9dCcD_SttsFv */
|
||||
dCcD_Stts::~dCcD_Stts() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
/* 800AC7AC-800AC808 .text __dt__10dCcD_GSttsFv */
|
||||
dCcD_GStts::~dCcD_GStts() {
|
||||
/* Nonmatching */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user