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

Various fixes and minor code cleanup, issue warning when attempting to load an unimplemented object

Browse Source
This commit is contained in:
Phillip Stephens
2019-01-31 12:44:05 -08:00
parent 7d29c6e25a
commit 0bb51f067c
34 changed files with 362 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@
namespace urde::MP1 {
class CMetroidData {
static constexpr u32 skNumProperties = 20;
CDamageVulnerability x0_dVuln1;
CDamageVulnerability x68_dVuln2;
float xd0_;
@@ -22,6 +23,7 @@ class CMetroidData {
public:
CMetroidData(CInputStream& in);
static u32 GetNumProperties() { return skNumProperties; }
};
class CMetroid : public CPatterned {
@@ -31,11 +33,12 @@ class CMetroid : public CPatterned {
};
u32 _dummy = 0;
};
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);
const CMetroidData& metroidData, TUniqueId);
bool GetX9BF_29() const { return x9bf_29_; }
};