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

CScriptTimer: Brace conditionals where applicable

This commit is contained in:
Lioncash 2020-05-07 11:47:05 -04:00
parent ca718f938e
commit bb578468f4
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Runtime/World/CScriptTimer.cpp
View File

@ -19,8 +19,9 @@ CScriptTimer::CScriptTimer(TUniqueId uid, std::string_view name, const CEntityIn
void CScriptTimer::Accept(IVisitor& visitor) { visitor.Visit(this); } void CScriptTimer::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptTimer::Think(float dt, CStateManager& mgr) { void CScriptTimer::Think(float dt, CStateManager& mgr) {
if (GetActive() && IsTiming()) if (GetActive() && IsTiming()) {
ApplyTime(dt, mgr); ApplyTime(dt, mgr);
}
} }
void CScriptTimer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) { void CScriptTimer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) {
@ -47,24 +48,32 @@ bool CScriptTimer::IsTiming() const { return x42_isTiming; }
void CScriptTimer::StartTiming(bool isTiming) { x42_isTiming = isTiming; } void CScriptTimer::StartTiming(bool isTiming) { x42_isTiming = isTiming; }
void CScriptTimer::Reset(CStateManager& mgr) { void CScriptTimer::Reset(CStateManager& mgr) {
float rDt = mgr.GetActiveRandom()->Float(); const float rDt = mgr.GetActiveRandom()->Float();
x34_time = (x3c_maxRandDelay * rDt) + x38_startTime; x34_time = (x3c_maxRandDelay * rDt) + x38_startTime;
} }
void CScriptTimer::ApplyTime(float dt, CStateManager& mgr) { void CScriptTimer::ApplyTime(float dt, CStateManager& mgr) {
if (x34_time <= 0.f || !GetActive()) if (x34_time <= 0.f || !GetActive()) {
return; return;
}
x34_time -= dt; x34_time -= dt;
if (x34_time <= 0.f) { if (x34_time > 0.f) {
SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None); return;
x42_isTiming = false;
if (x40_loop) {
Reset(mgr);
if (x41_autoStart)
x42_isTiming = true;
}
} }
SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None);
x42_isTiming = false;
if (!x40_loop) {
return;
}
Reset(mgr);
if (!x41_autoStart) {
return;
}
x42_isTiming = true;
} }
} // namespace urde } // namespace urde