Header merge & CScriptPickup progress

Former-commit-id: 45c5450376
This commit is contained in:
2022-10-05 19:06:15 -04:00
parent b95f4a88b2
commit a578b055a2
55 changed files with 542 additions and 313 deletions

View File

@@ -18,25 +18,26 @@ class CScriptPickup : public CPhysicsActor {
float x270_curTime;
float x274_tractorTime;
float x278_delayTimer;
TLockedToken<CGenDescription> x27c_pickupParticleDesc;
rstl::optional_object< TCachedToken< CGenDescription > > x27c_pickupParticleDesc;
bool x28c_24_generated : 1;
bool x28c_25_inTractor : 1;
bool x28c_26_enableTractorTest : 1;
public:
CScriptPickup(TUniqueId uid, const rstl::string& name, const CEntityInfo& info, const CTransform4f& xf,
const CModelData& mData, const CActorParameters& aParams, const CAABox& aabb,
CPlayerState::EItemType itemType, int amount, int capacity, CAssetId pickupEffect, float possibility,
float lifeTime, float fadeInTime, float startDelay, bool active);
CScriptPickup(TUniqueId uid, const rstl::string& name, const CEntityInfo& info,
const CTransform4f& xf, const CModelData& mData, const CActorParameters& aParams,
const CAABox& aabb, CPlayerState::EItemType itemType, int amount, int capacity,
CAssetId pickupEffect, float possibility, float lifeTime, float fadeInTime,
float startDelay, bool active);
~CScriptPickup();
void Think(float, CStateManager&) override;
void Touch(CActor&, CStateManager&) override;
rstl::optional_object<CAABox> GetTouchBounds() const override;
rstl::optional_object< CAABox > GetTouchBounds() const override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void Render(const CStateManager&) const override;
void Accept(IVisitor& visitor) override;
float GetPossibility() const;
CPlayerState::EItemType GetItem() const;
void SetSpawned();