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

Lots of ScriptObject and Collision work

Browse Source
This commit is contained in:
Phillip Stephens
2017-01-03 20:08:30 -08:00
parent daa7d510f8
commit b765ce3eb7
49 changed files with 899 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Runtime/World/CStateMachine.hpp
View File

@@ -68,7 +68,7 @@ class CStateMachine
public:
CStateMachine(CInputStream& in);
s32 GetStateIndex(const std::string& state);
s32 GetStateIndex(const std::string& state) const;
const std::vector<CAiState>& GetStateVector() const;
};
@@ -76,9 +76,9 @@ class CStateMachineState
{
const CStateMachine* x0_machine = nullptr;
CAiState* x4_state = nullptr;
float x8_ = 0;
float xc_ = 0;
float x10_ = 0;
float x8_time = 0.f;
float xc_ = 0.f;
float x10_ = 0.f;
union
{
struct
@@ -95,12 +95,12 @@ public:
void Update(CStateManager& mgr, CAi& ai, float delta)
{
x8_ += delta;
x8_time += delta;
if (x4_state)
x4_state->CallFunc(mgr, ai, EStateMsg::One, delta);
}
void SetState(CStateManager&, CAi&, s32);
void SetState(CStateManager &, CAi &, const std::string&);
void SetState(CStateManager&, CAi&, const CStateMachine*, const std::string&);
const std::vector<CAiState>* GetStateVector() const;
void Setup(const CStateMachine* machine);
std::string GetName() const;