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

New code style refactor

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Runtime/MP1/World/CMetroid.hpp
View File

@@ -3,36 +3,33 @@
#include "World/CPatterned.hpp"
#include "World/CAnimationParameters.hpp"
namespace urde::MP1
{
namespace urde::MP1 {
class CMetroidData {
CDamageVulnerability x0_dVuln1;
CDamageVulnerability x68_dVuln2;
float xd0_;
float xd4_;
float xd8_;
float xdc_;
float xe0_;
float xe4_;
std::experimental::optional<CAnimationParameters> xe8_animParms1;
std::experimental::optional<CAnimationParameters> xf8_animParms2;
std::experimental::optional<CAnimationParameters> x108_animParms3;
std::experimental::optional<CAnimationParameters> x118_animParms4;
bool x128_24_ : 1;
class CMetroidData
{
CDamageVulnerability x0_dVuln1;
CDamageVulnerability x68_dVuln2;
float xd0_;
float xd4_;
float xd8_;
float xdc_;
float xe0_;
float xe4_;
std::experimental::optional<CAnimationParameters> xe8_animParms1;
std::experimental::optional<CAnimationParameters> xf8_animParms2;
std::experimental::optional<CAnimationParameters> x108_animParms3;
std::experimental::optional<CAnimationParameters> x118_animParms4;
bool x128_24_ : 1;
public:
CMetroidData(CInputStream& in);
CMetroidData(CInputStream& in);
};
class CMetroid : public CPatterned
{
class CMetroid : public CPatterned {
public:
DEFINE_PATTERNED(Metroid)
CMetroid(TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& aParms, const CMetroidData& metroidData);
DEFINE_PATTERNED(Metroid)
CMetroid(TUniqueId uid, std::string_view name, EFlavorType flavor, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& aParms,
const CMetroidData& metroidData);
};
}
} // namespace urde::MP1