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

More particle bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-13 13:27:47 -10:00
parent faf0ac7d27
commit 9130b9459a
10 changed files with 148 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Runtime/World/CScriptPlayerActor.hpp
View File

@@ -2,26 +2,27 @@
#define __URDE_CSCRIPTPLAYERACTOR_HPP__
#include "CScriptActor.hpp"
#include "CPlayerState.hpp"
namespace urde
{
class CScriptPlayerActor : public CScriptActor
{
CAnimRes x2e8_;
u32 x304_;
s32 x308_ = -1;
CAnimRes x2e8_suitRes;
CPlayerState::EBeamId x304_beam;
CPlayerState::EPlayerSuit x308_suit = CPlayerState::EPlayerSuit::Invalid;
s32 x30c_ = -1;
s32 x310_ = -1;
s32 x310_loadedCharIdx = -1;
u32 x314_ = 0;
u32 x318_ = 0;
u32 x31c_ = 0;
u32 x320_ = 0;
u32 x324_ = 0;
TLockedToken<CModel> x324_suitModel;
u8 x334_ = 0;
u8 x344_ = 0;
u32 x348_ = 0;
float x34c_ = 0.f;
u32 x350_;
u32 x350_flags;
union
{
struct
@@ -36,13 +37,19 @@ class CScriptPlayerActor : public CScriptActor
bool x354_31_ : 1;
bool x355_24_ : 1;
};
u8 x355_dummy = 0;
u32 _dummy = 0;
};
u32 GetSuitCharIdx(const CStateManager& mgr, CPlayerState::EPlayerSuit suit) const;
void LoadSuit(u32 charIdx);
void LoadBeam(CPlayerState::EBeamId beam);
public:
CScriptPlayerActor(TUniqueId, std::string_view, const CEntityInfo&, const zeus::CTransform&, const CAnimRes&,
CModelData&&, const zeus::CAABox&, bool, const CMaterialList&, float, float,
const CHealthInfo&, const CDamageVulnerability&, const CActorParameters&, bool, bool, u32, u32);
CScriptPlayerActor(TUniqueId uid, std::string_view name, const CEntityInfo& info,
const zeus::CTransform& xf, const CAnimRes& animRes, CModelData&& mData,
const zeus::CAABox& aabox, bool b1, const CMaterialList& list, float mass,
float zMomentum, const CHealthInfo& hInfo, const CDamageVulnerability& dVuln,
const CActorParameters& aParams, bool loop, bool active, u32 flags, CPlayerState::EBeamId beam);
void Think(float, CStateManager &);
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager &);