AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 10:57:02 +00:00
Code Issues Projects Releases Wiki Activity

CFlaahgra: Migrate static data into the cpp file

Browse Source 
Same behavior, but completely makes them internally linked.

We can also make use of std::array and dehardcode some array sizes.
This commit is contained in:
Lioncash
2020-04-12 11:14:00 -04:00
parent f5418d30aa
commit 02a684cfdf
2 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,13 +86,6 @@ public:
};
class CFlaahgra : public CPatterned {
static const SJointInfo skLeftArmJointList[3];
static const SJointInfo skRightArmJointList[3];
static const SSphereJointInfo skSphereJointList[5];
static constexpr zeus::CColor skDamageColor = zeus::CColor(0.5f, 0.5f, 0.f, 1.f);
static constexpr zeus::CColor skUnkColor = zeus::CColor(0.5f, 0.f, 0.f, 1.f);
static constexpr zeus::CVector3f skUnkVec1 = zeus::CVector3f(0.5f, 7.f, 0.f);
s32 x568_ = -1;
CFlaahgraData x56c_;
std::unique_ptr<CBoneTracking> x6cc_boneTracking; // Used to be an rstl::pair<bool,CBoneTracking>
@@ -163,8 +156,8 @@ class CFlaahgra : public CPatterned {
void LoadTokens(CStateManager& mgr);
void FinalizeLoad(CStateManager& mgr);
void GetMirrorWaypoints(CStateManager& mgr);
void AddCollisionList(const SJointInfo*, int, std::vector<CJointCollisionDescription>&);
void AddSphereCollisionList(const SSphereJointInfo*, int, std::vector<CJointCollisionDescription>&);
void AddCollisionList(const SJointInfo*, size_t, std::vector<CJointCollisionDescription>&);
void AddSphereCollisionList(const SSphereJointInfo*, size_t, std::vector<CJointCollisionDescription>&);
void SetupCollisionManagers(CStateManager&);
void sub801ae980(CStateManager&);
void UpdateCollisionManagers(float, CStateManager&);