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

Merge branch 'pr-148'

This commit is contained in:
Phillip Stephens 2020-02-07 14:25:31 -08:00
parent 6501d56baa 16f7925652
commit 61f9adfa70
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/World/CFireFlea.cpp
View File

@ -85,7 +85,7 @@ void CFireFlea::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateM
x450_bodyController->Activate(mgr); x450_bodyController->Activate(mgr);
} else if (msg == EScriptObjectMessage::InitializedInArea) { } else if (msg == EScriptObjectMessage::InitializedInArea) {
xd8c_pathFind.SetArea(mgr.GetWorld()->GetAreaAlways(GetAreaIdAlways())->GetPostConstructed()->x10bc_pathArea); xd8c_pathFind.SetArea(mgr.GetWorld()->GetAreaAlways(GetAreaIdAlways())->GetPostConstructed()->x10bc_pathArea);
xe64_ = 50.f; xd8c_pathFind.SetPadding(50.0f);
} }
} }

1
Runtime/MP1/World/CFireFlea.hpp
View File

@ -30,7 +30,6 @@ class CFireFlea : public CPatterned {
float x568_ = 1.f; float x568_ = 1.f;
float x56c_; float x56c_;
rstl::reserved_vector<TUniqueId, 1024> x570_nearList; rstl::reserved_vector<TUniqueId, 1024> x570_nearList;
float xe64_;
zeus::CVector3f xd74_; zeus::CVector3f xd74_;
zeus::CVector3f xd80_targetPos; zeus::CVector3f xd80_targetPos;
CPathFindSearch xd8c_pathFind; CPathFindSearch xd8c_pathFind;

1
Runtime/World/CPathFindSearch.hpp
View File

@ -56,6 +56,7 @@ public:
void SetArea(CPFArea* area) { x0_area = area; } void SetArea(CPFArea* area) { x0_area = area; }
float GetCharacterHeight() const { return xd0_chHeight; } float GetCharacterHeight() const { return xd0_chHeight; }
void SetCharacterHeight(float h) { xd0_chHeight = h; } void SetCharacterHeight(float h) { xd0_chHeight = h; }
void SetPadding(float padding) { xd8_padding = padding; }
float RemainingPathDistance(const zeus::CVector3f& pos) const; float RemainingPathDistance(const zeus::CVector3f& pos) const;
void DebugDraw() const; void DebugDraw() const;
}; };