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

CMetaree: Fix Halt delay

Browse Source
This commit is contained in:
Luke Street
2020-05-14 11:27:13 -04:00
parent 47d767c441
commit ff62fddc89
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Runtime/MP1/World/CMetaree.hpp
View File

@@ -10,7 +10,7 @@
namespace urde::MP1 {
class CMetaree : public CPatterned {
float x568_delay;
float x56c_;
float x56c_haltDelay;
float x570_dropHeight;
zeus::CVector3f x574_offset;
float x580_attackSpeed;
@@ -20,16 +20,9 @@ class CMetaree : public CPatterned {
u32 x5a8_ = 0;
CDamageInfo x5ac_damageInfo;
u16 x5c8_attackSfx = SFXsfx0225;
struct {
struct {
bool x5ca_24_ : 1;
bool x5ca_25_started : 1;
bool x5ca_26_deactivated : 1;
};
u16 _dummy;
};
bool x5ca_24_ : 1;
bool x5ca_25_started : 1;
bool x5ca_26_deactivated : 1;
u32 x5cc_;
public: