AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 06:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix CMemoryCardSys shutdown crash

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-22 09:36:25 -08:00
parent eb955c53ec
commit 12c6163e32
9 changed files with 88 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Runtime/Particle/CDecal.hpp
View File

@@ -18,7 +18,7 @@ public:
{
struct
{
bool x0_24_ : 1;
bool x0_24_invalid : 1;
};
u32 _dummy = 0;
};
@@ -28,7 +28,7 @@ public:
: x4_lifetime(i),
x8_rotation(f)
{
x0_24_ = true;
x0_24_invalid = true;
}
};
private:
@@ -39,11 +39,20 @@ private:
zeus::CTransform xc_transform;
CQuadDecal x3c_decalQuad1;
CQuadDecal x48_decalQuad2;
u32 x54_ = 0;
u32 x58_ = 0;
u32 x5c_ = 0;
zeus::CVector3f x60_;
void InitQuad(CQuadDecal&, const CDecalDescription::SQuadDescr&);
s32 x54_lifetime = 0;
s32 x58_frameIdx = 0;
union
{
struct
{
bool x5c_31_quad1Invalid : 1;
bool x5c_30_quad2Invalid : 1;
bool x5c_29_modelInvalid : 1;
};
u32 x5c_dummy = 0;
};
zeus::CVector3f x60_rotation;
bool InitQuad(CQuadDecal&, const CDecalDescription::SQuadDescr&);
public:
CDecal(const TToken<CDecalDescription>&, const zeus::CTransform&);
bool IsDone() const;