AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

This commit is contained in:
Jack Andersen 2018-05-15 18:08:09 -10:00
parent 0987866896 9929dfbc6a
commit c6d7950896
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/World/CScriptActorKeyframe.cpp
View File

@ -19,7 +19,7 @@ CScriptActorKeyframe::CScriptActorKeyframe(TUniqueId uid, std::string_view name,
x44_25_disableUpdate = b2; x44_25_disableUpdate = b2;
x44_26_ = w2; x44_26_ = w2;
x44_27_ = w2; x44_27_ = w2;
x44_28_ = false; x44_28_playing = false;
x44_29_ = false; x44_29_ = false;
} }
@ -48,7 +48,7 @@ void CScriptActorKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId u
} }
} }
x44_28_ = true; x44_28_playing = true;
SendScriptMsgs(EScriptObjectState::Play, mgr, EScriptObjectMessage::None); SendScriptMsgs(EScriptObjectState::Play, mgr, EScriptObjectMessage::None);
} }
} }
@ -63,7 +63,7 @@ void CScriptActorKeyframe::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId u
void CScriptActorKeyframe::Think(float dt, CStateManager& mgr) void CScriptActorKeyframe::Think(float dt, CStateManager& mgr)
{ {
if (!x44_25_disableUpdate || !x44_24_looping || !x44_27_ || !x44_28_ || x40_lifetime <= 0.f) if (x44_25_disableUpdate || !x44_24_looping || !x44_27_ || !x44_28_playing || x40_lifetime <= 0.f)
{ {
CEntity::Think(dt, mgr); CEntity::Think(dt, mgr);
return; return;
@ -76,7 +76,7 @@ void CScriptActorKeyframe::Think(float dt, CStateManager& mgr)
return; return;
} }
x44_28_ = false; x44_28_playing = false;
for (const SConnection& conn : x20_conns) for (const SConnection& conn : x20_conns)
{ {
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg!= EScriptObjectMessage::Play) if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg!= EScriptObjectMessage::Play)
@ -135,6 +135,7 @@ void CScriptActorKeyframe::UpdateEntity(TUniqueId uid, CStateManager& mgr)
} }
} }
} }
/* TODO: Finish */ /* else if (TCastTo<CAi> ai = ent)
* TODO: Finish */
} }
} }

2
Runtime/World/CScriptActorKeyframe.hpp
View File

@ -19,7 +19,7 @@ private:
bool x44_25_disableUpdate : 1; bool x44_25_disableUpdate : 1;
bool x44_26_ : 1; bool x44_26_ : 1;
bool x44_27_ : 1; bool x44_27_ : 1;
bool x44_28_ : 1; bool x44_28_playing : 1;
bool x44_29_ : 1; bool x44_29_ : 1;
}; };
u8 _dummy = 0; u8 _dummy = 0;