2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 23:07:42 +00:00

New code style refactor

This commit is contained in:
Jack Andersen
2018-12-07 19:30:43 -10:00
parent 41ae32be31
commit 636c82a568
1451 changed files with 171430 additions and 203303 deletions

View File

@@ -2,8 +2,7 @@
#include "CStateManager.hpp"
#include "TCastTo.hpp"
namespace urde
{
namespace urde {
CScriptTimer::CScriptTimer(TUniqueId uid, std::string_view name, const CEntityInfo& info, float startTime,
float maxRandDelay, bool loop, bool autoStart, bool active)
@@ -13,78 +12,57 @@ CScriptTimer::CScriptTimer(TUniqueId uid, std::string_view name, const CEntityIn
, x3c_maxRandDelay(maxRandDelay)
, x40_loop(loop)
, x41_autoStart(autoStart)
, x42_isTiming(autoStart)
{
, x42_isTiming(autoStart) {}
void CScriptTimer::Accept(IVisitor& visitor) { visitor.Visit(this); }
void CScriptTimer::Think(float dt, CStateManager& mgr) {
if (GetActive() && IsTiming())
ApplyTime(dt, mgr);
}
void CScriptTimer::Accept(IVisitor& visitor)
{
visitor.Visit(this);
}
void CScriptTimer::Think(float dt, CStateManager& mgr)
{
if (GetActive() && IsTiming())
ApplyTime(dt, mgr);
}
void CScriptTimer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr)
{
if (GetActive())
{
if (msg == EScriptObjectMessage::Start)
{
StartTiming(true);
}
else if (msg == EScriptObjectMessage::Stop)
{
StartTiming(false);
}
else if (msg == EScriptObjectMessage::ResetAndStart)
{
Reset(stateMgr);
StartTiming(true);
}
else if (msg == EScriptObjectMessage::Reset)
{
Reset(stateMgr);
}
else if (msg == EScriptObjectMessage::StopAndReset)
{
Reset(stateMgr);
StartTiming(false);
}
void CScriptTimer::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId objId, CStateManager& stateMgr) {
if (GetActive()) {
if (msg == EScriptObjectMessage::Start) {
StartTiming(true);
} else if (msg == EScriptObjectMessage::Stop) {
StartTiming(false);
} else if (msg == EScriptObjectMessage::ResetAndStart) {
Reset(stateMgr);
StartTiming(true);
} else if (msg == EScriptObjectMessage::Reset) {
Reset(stateMgr);
} else if (msg == EScriptObjectMessage::StopAndReset) {
Reset(stateMgr);
StartTiming(false);
}
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
}
CEntity::AcceptScriptMsg(msg, objId, stateMgr);
}
bool CScriptTimer::IsTiming() const { return x42_isTiming; }
void CScriptTimer::StartTiming(bool isTiming) { x42_isTiming = isTiming; }
void CScriptTimer::Reset(CStateManager& mgr)
{
float rDt = mgr.GetActiveRandom()->Float();
x34_time = (x3c_maxRandDelay * rDt) + x38_startTime;
void CScriptTimer::Reset(CStateManager& mgr) {
float rDt = mgr.GetActiveRandom()->Float();
x34_time = (x3c_maxRandDelay * rDt) + x38_startTime;
}
void CScriptTimer::ApplyTime(float dt, CStateManager& mgr)
{
if (x34_time <= 0.f || !GetActive())
return;
void CScriptTimer::ApplyTime(float dt, CStateManager& mgr) {
if (x34_time <= 0.f || !GetActive())
return;
x34_time -= dt;
if (x34_time <= 0.f)
{
SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None);
x34_time -= dt;
if (x34_time <= 0.f) {
SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None);
x42_isTiming = false;
if (x40_loop)
{
Reset(mgr);
if (x41_autoStart)
x42_isTiming = true;
}
x42_isTiming = false;
if (x40_loop) {
Reset(mgr);
if (x41_autoStart)
x42_isTiming = true;
}
}
}
}
} // namespace urde