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

CFlaahgraPlants: Set xf4_damageInfo in constructor

This commit is contained in:
Luke Street 2020-08-14 00:41:37 -04:00
parent 261544131f
commit 9de84dace3
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/MP1/World/CFlaahgra.cpp
View File

@ -1284,6 +1284,7 @@ CFlaahgraPlants::CFlaahgraPlants(const TToken<CGenDescription>& genDesc, const C
CMaterialList(EMaterialTypes::Projectile), actParms, kInvalidUniqueId) CMaterialList(EMaterialTypes::Projectile), actParms, kInvalidUniqueId)
, xe8_elementGen(std::make_unique<CElementGen>(genDesc)) , xe8_elementGen(std::make_unique<CElementGen>(genDesc))
, xf0_ownerId(owner) , xf0_ownerId(owner)
, xf4_damageInfo(dInfo)
, x130_obbox(xf, extents) { , x130_obbox(xf, extents) {
xe8_elementGen->SetOrientation(xf.getRotation()); xe8_elementGen->SetOrientation(xf.getRotation());
xe8_elementGen->SetTranslation(xf.origin); xe8_elementGen->SetTranslation(xf.origin);
@ -1320,6 +1321,7 @@ void CFlaahgraPlants::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, C
mgr.FreeScriptObject(x16c_colAct); mgr.FreeScriptObject(x16c_colAct);
} }
} }
void CFlaahgraPlants::Think(float dt, CStateManager& mgr) { void CFlaahgraPlants::Think(float dt, CStateManager& mgr) {
if (GetActive()) { if (GetActive()) {
xe8_elementGen->Update(dt); xe8_elementGen->Update(dt);
@ -1331,7 +1333,7 @@ void CFlaahgraPlants::Think(float dt, CStateManager& mgr) {
} }
void CFlaahgraPlants::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) { void CFlaahgraPlants::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) {
g_Renderer->AddParticleGen(*xe8_elementGen.get()); g_Renderer->AddParticleGen(*xe8_elementGen);
CActor::AddToRenderer(frustum, mgr); CActor::AddToRenderer(frustum, mgr);
} }
@ -1355,4 +1357,11 @@ void CFlaahgraPlants::Touch(CActor& act, CStateManager& mgr) {
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}), CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {}),
diffVec.dot(GetTransform().basis[0]) > 0.f ? GetTransform().basis[0] : -GetTransform().basis[0]); diffVec.dot(GetTransform().basis[0]) > 0.f ? GetTransform().basis[0] : -GetTransform().basis[0]);
} }
std::optional<zeus::CAABox> CFlaahgraPlants::GetTouchBounds() const {
if (!GetActive()) {
return {};
}
return x110_aabox;
}
} // namespace urde::MP1 } // namespace urde::MP1

2
Runtime/MP1/World/CFlaahgra.hpp
View File

@ -82,7 +82,7 @@ public:
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override; void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override; void Think(float, CStateManager&) override;
void AddToRenderer(const zeus::CFrustum&, CStateManager&) override; void AddToRenderer(const zeus::CFrustum&, CStateManager&) override;
std::optional<zeus::CAABox> GetTouchBounds() const override { return x110_aabox; } std::optional<zeus::CAABox> GetTouchBounds() const override;
void Touch(CActor&, CStateManager&) override; void Touch(CActor&, CStateManager&) override;
}; };