AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-07 07:25:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pr-126'

Browse Source
This commit is contained in:
Luke Street 2020-01-17 19:57:50 -05:00
commit 72e068419f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/MP1/World/CNewIntroBoss.cpp
View File

@ -298,8 +298,9 @@ void CNewIntroBoss::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& nod
StopRumble(mgr); StopRumble(mgr);
x63c_attackTime = GetNextAttackTime(mgr); x63c_attackTime = GetNextAttackTime(mgr);
SendScriptMsgs(EScriptObjectState::Attack, mgr, EScriptObjectMessage::None); SendScriptMsgs(EScriptObjectState::Attack, mgr, EScriptObjectMessage::None);
} else } else {
CActor::DoUserAnimEvent(mgr, node, event, dt); CPatterned::DoUserAnimEvent(mgr, node, event, dt);
}
} }
void CNewIntroBoss::AddToRenderer(const zeus::CFrustum&, const CStateManager& mgr) const { EnsureRendered(mgr); } void CNewIntroBoss::AddToRenderer(const zeus::CFrustum&, const CStateManager& mgr) const { EnsureRendered(mgr); }