AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CDrone: Rename x690_colSphere, x834_31_attackOver

This commit is contained in:
Luke Street 2020-09-09 02:31:38 -04:00
parent fb7e8cd65a
commit 9b5d1a6ba6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/MP1/World/CDrone.cpp
View File

@ -61,7 +61,7 @@ CDrone::CDrone(TUniqueId uid, std::string_view name, EFlavorType flavor, const C
, x65c_(f21) , x65c_(f21)
, x660_(f22) , x660_(f22)
, x664_(f24) , x664_(f24)
, x690_(zeus::CSphere({0.f, 0.f, 1.8f}, 1.1f), CActor::GetMaterialList()) , x690_colSphere(zeus::CSphere({0.f, 0.f, 1.8f}, 1.1f), CActor::GetMaterialList())
, x6b0_pathFind(nullptr, 3 + int(b1), pInfo.GetPathfindingIndex(), 1.f, 2.4f) , x6b0_pathFind(nullptr, 3 + int(b1), pInfo.GetPathfindingIndex(), 1.f, 2.4f)
, x7cc_(CSfxManager::TranslateSFXID(sId)) , x7cc_(CSfxManager::TranslateSFXID(sId))
, x82c_shieldModel(std::make_unique<CModelData>(CStaticRes{aId2, zeus::skOne3f})) , x82c_shieldModel(std::make_unique<CModelData>(CStaticRes{aId2, zeus::skOne3f}))
@ -281,6 +281,10 @@ void CDrone::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateM
} }
} }
void CDrone::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) {
CPatterned::AddToRenderer(frustum, mgr);
}
void CDrone::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) { void CDrone::PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) {
CPatterned::PreRender(mgr, frustum); CPatterned::PreRender(mgr, frustum);
if (x3fc_flavor == EFlavorType::One) { if (x3fc_flavor == EFlavorType::One) {
@ -401,7 +405,7 @@ void CDrone::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, EUse
const CCollisionPrimitive* CDrone::GetCollisionPrimitive() const { const CCollisionPrimitive* CDrone::GetCollisionPrimitive() const {
if (!x834_28_) if (!x834_28_)
return &x690_; return &x690_colSphere;
return CPatterned::GetCollisionPrimitive(); return CPatterned::GetCollisionPrimitive();
} }

5
Runtime/MP1/World/CDrone.hpp
View File

@ -62,7 +62,7 @@ class CDrone : public CPatterned {
zeus::CVector3f x670_; zeus::CVector3f x670_;
zeus::CVector3f x67c_; zeus::CVector3f x67c_;
TUniqueId x688_teamMgr = kInvalidUniqueId; TUniqueId x688_teamMgr = kInvalidUniqueId;
CCollidableSphere x690_; CCollidableSphere x690_colSphere;
CPathFindSearch x6b0_pathFind; CPathFindSearch x6b0_pathFind;
zeus::CAxisAngle x794_; zeus::CAxisAngle x794_;
zeus::CVector3f x7a0_; zeus::CVector3f x7a0_;
@ -89,7 +89,7 @@ class CDrone : public CPatterned {
bool x834_28_ : 1 = false; bool x834_28_ : 1 = false;
bool x834_29_codeTrigger : 1 = false; bool x834_29_codeTrigger : 1 = false;
bool x834_30_visible : 1 = false; bool x834_30_visible : 1 = false;
bool x834_31_ : 1 = false; bool x834_31_attackOver : 1 = false;
bool x835_24_ : 1 = false; bool x835_24_ : 1 = false;
bool x835_25_ : 1; bool x835_25_ : 1;
bool x835_26_ : 1 = false; bool x835_26_ : 1 = false;
@ -121,6 +121,7 @@ public:
void Accept(IVisitor& visitor) override; void Accept(IVisitor& visitor) override;
void Think(float dt, CStateManager& mgr) override; void Think(float dt, CStateManager& mgr) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override; void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId sender, CStateManager& mgr) override;
void AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) override;
void PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) override; void PreRender(CStateManager& mgr, const zeus::CFrustum& frustum) override;
void Render(CStateManager& mgr) override; void Render(CStateManager& mgr) override;
bool CanRenderUnsorted(const CStateManager& mgr) const override; bool CanRenderUnsorted(const CStateManager& mgr) const override;