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

Implement CScriptGenerator

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-24 09:23:10 -08:00
parent 9f3b979970
commit 696f7a9772
13 changed files with 446 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Runtime/CStateManager.hpp
View File

@@ -144,12 +144,12 @@ class CStateManager
{
struct
{
bool xe86_24_;
bool xe86_25_;
bool xe86_26_;
bool xe86_27_;
bool xe86_28_;
bool xe86_29_;
bool xe86_24_ : 1;
bool xe86_25_ : 1;
bool xe86_26_ : 1;
bool xe86_27_ : 1;
bool xe86_28_ : 1;
bool xe86_29_ : 1;
};
u16 _dummy = 0;
};
@@ -165,10 +165,18 @@ class CStateManager
TUniqueId xf74_lastTrigger = kInvalidUniqueId;
TUniqueId xf76_lastRelay = kInvalidUniqueId;
union
{
struct
{
bool xf94_26_generatingObject : 1;
};
u32 xf94_ = 0;
};
public:
/* TODO: Public for CFirstPersonCamera */
u32 x904_;
CStateManager(const std::weak_ptr<CRelayTracker>&,
const std::weak_ptr<CMapWorldInfo>&,
const std::weak_ptr<CPlayerState>&,
@@ -221,6 +229,7 @@ public:
GetIdListForScript(TEditorId) const;
void LoadScriptObjects(TAreaId, CInputStream& in, std::vector<TEditorId>& idsOut);
void LoadScriptObject(TAreaId, EScriptObjectType, u32, CInputStream& in);
std::pair<TEditorId, TUniqueId> GenerateObject(TEditorId);
void InitScriptObjects(std::vector<TEditorId>& ids);
void InformListeners(const zeus::CVector3f&, EListenNoiseType);
bool ApplyKnockBack(CActor& actor, const CDamageInfo& info,
@@ -312,6 +321,8 @@ public:
void SetLastRelayId(TUniqueId uid) { xf76_lastRelay = uid; }
TUniqueId* GetLastRelayIdPtr() { return &xf76_lastRelay; }
TUniqueId GetLastRelayId() const { return xf76_lastRelay; }
bool GetIsGeneratingObject() const { return xf94_26_generatingObject; }
void SetIsGeneratingObject(bool gen) { xf94_26_generatingObject = gen; }
};
}