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

Underp teh derp in CScriptActorRotate

This commit is contained in:
Phillip Stephens 2017-08-19 15:51:29 -07:00
parent 7f27a56e61
commit 51811680c3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CScriptActorRotate.cpp
View File

@ -25,19 +25,17 @@ void CScriptActorRotate::Accept(IVisitor& visitor)
void CScriptActorRotate::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) void CScriptActorRotate::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr)
{ {
bool acceptCalled = false;
if (msg == EScriptObjectMessage::Activate) if (msg == EScriptObjectMessage::Activate)
{ {
CEntity::AcceptScriptMsg(msg, uid, mgr); CEntity::AcceptScriptMsg(msg, uid, mgr);
acceptCalled = true; return;
} }
if (msg == EScriptObjectMessage::Action || msg == EScriptObjectMessage::Next if (msg == EScriptObjectMessage::Action || msg == EScriptObjectMessage::Next
|| (msg == EScriptObjectMessage::Registered && x58_27_updateOnCreation)) || (msg == EScriptObjectMessage::Registered && x58_27_updateOnCreation))
UpdateActors(msg == EScriptObjectMessage::Next, mgr); UpdateActors(msg == EScriptObjectMessage::Next, mgr);
if (!acceptCalled) CEntity::AcceptScriptMsg(msg, uid, mgr);
CEntity::AcceptScriptMsg(msg, uid, mgr);
} }
void CScriptActorRotate::Think(float dt, CStateManager& mgr) void CScriptActorRotate::Think(float dt, CStateManager& mgr)