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

CBabygoth: Make use of std::array where applicable

Browse Source 
Same behavior, no implicit array to pointer decay. We can also move all
this data into the cpp file fully.
This commit is contained in:
Lioncash
2020-04-12 11:03:47 -04:00
parent f1aca12e6b
commit abd576a43a
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,9 +63,6 @@ public:
enum class EShellState { Default, CrackOne, CrackTwo, Destroyed };
private:
static constexpr s32 skSphereJointCount = 5;
static const SSphereJointInfo skSphereJointList[skSphereJointCount];
static const std::string_view skpMouthDamageJoint;
s32 x568_stateProg = -1;
EShellState x56c_shellState = EShellState::Default;
CBabygothData x570_babyData;
@@ -115,7 +112,7 @@ private:
bool xa49_28_onApproachPath : 1;
bool xa49_29_objectSpaceCollision : 1;
void AddSphereCollisionList(const SSphereJointInfo*, s32, std::vector<CJointCollisionDescription>&);
void AddSphereCollisionList(const SSphereJointInfo*, size_t, std::vector<CJointCollisionDescription>&);
void SetupCollisionManager(CStateManager&);