2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 01:37:03 +00:00

New code style refactor

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

View File

@@ -3,41 +3,38 @@
#include "World/CPatterned.hpp"
#include "CMetroid.hpp"
namespace urde::MP1
{
namespace urde::MP1 {
class CMetroidBetaData {
CDamageVulnerability x0_;
CDamageVulnerability x68_;
float xd0_;
float xd4_;
float xd8_;
float xdc_;
float xe0_;
float xe4_;
float xe8_;
float xec_;
float xf0_;
CAssetId xf4_;
CAssetId xf8_;
CAssetId xfc_;
CAssetId x100_;
CAssetId x104_;
bool x108_24_ : 1;
class CMetroidBetaData
{
CDamageVulnerability x0_;
CDamageVulnerability x68_;
float xd0_;
float xd4_;
float xd8_;
float xdc_;
float xe0_;
float xe4_;
float xe8_;
float xec_;
float xf0_;
CAssetId xf4_;
CAssetId xf8_;
CAssetId xfc_;
CAssetId x100_;
CAssetId x104_;
bool x108_24_ : 1;
public:
CMetroidBetaData(CInputStream&);
CMetroidBetaData(CInputStream&);
};
class CMetroidBeta : public CPatterned
{
class CMetroidBeta : public CPatterned {
public:
DEFINE_PATTERNED(MetroidBeta)
CMetroidBeta(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo,
const CActorParameters& aParms, const CMetroidBetaData& metroidData);
void RenderHitGunEffect() const;
void RenderHitBallEffect() const;
DEFINE_PATTERNED(MetroidBeta)
CMetroidBeta(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
CModelData&& mData, const CPatternedInfo& pInfo, const CActorParameters& aParms,
const CMetroidBetaData& metroidData);
void RenderHitGunEffect() const;
void RenderHitBallEffect() const;
};
}
} // namespace urde::MP1