From 470d649604d3b9785cd81a00a8fe96f068bf68e3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 7 May 2020 13:43:08 -0400 Subject: [PATCH] CScriptDock: Brace conditionals where applicable --- Runtime/World/CScriptDock.cpp | 84 ++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 35 deletions(-) diff --git a/Runtime/World/CScriptDock.cpp b/Runtime/World/CScriptDock.cpp index f10d7c38b..0c3d3c6fe 100644 --- a/Runtime/World/CScriptDock.cpp +++ b/Runtime/World/CScriptDock.cpp @@ -36,32 +36,33 @@ void CScriptDock::Think(float dt, CStateManager& mgr) { } const IGameArea::Dock* gameDock = mgr.GetWorld()->GetArea(x260_area)->GetDock(x25c_dock); - TAreaId connArea = gameDock->GetConnectedAreaId(gameDock->GetReferenceCount()); + const TAreaId connArea = gameDock->GetConnectedAreaId(gameDock->GetReferenceCount()); if (connArea != kInvalidAreaId) { - bool connPostConstructed = mgr.GetWorld()->GetArea(connArea)->IsPostConstructed(); + const bool connPostConstructed = mgr.GetWorld()->GetArea(connArea)->IsPostConstructed(); if (x268_26_areaPostConstructed != connPostConstructed) { x268_26_areaPostConstructed = connPostConstructed; - if (connPostConstructed) + if (connPostConstructed) { CEntity::SendScriptMsgs(EScriptObjectState::MaxReached, mgr, EScriptObjectMessage::None); - else + } else { CEntity::SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None); + } } } - if (mgr.GetNextAreaId() != x260_area) + if (mgr.GetNextAreaId() != x260_area) { x264_dockState = EDockState::Three; - else if (x264_dockState == EDockState::Three) + } else if (x264_dockState == EDockState::Three) { x264_dockState = EDockState::Idle; - else if (x264_dockState == EDockState::PlayerTouched) + } else if (x264_dockState == EDockState::PlayerTouched) { x264_dockState = EDockState::EnterNextArea; - else if (x264_dockState == EDockState::EnterNextArea) { + } else if (x264_dockState == EDockState::EnterNextArea) { CPlayer& player = mgr.GetPlayer(); if (HasPointCrossedDock(mgr, player.GetTranslation())) { - IGameArea::Dock* dock = mgr.GetWorld()->GetArea(mgr.GetNextAreaId())->GetDock(x25c_dock); - TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount()); + const IGameArea::Dock* dock = mgr.GetWorld()->GetArea(mgr.GetNextAreaId())->GetDock(x25c_dock); + const TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount()); if (aid != kInvalidAreaId && mgr.GetWorld()->GetArea(aid)->GetActive()) { mgr.SetCurrentAreaId(aid); - s32 otherDock = dock->GetOtherDockNumber(dock->GetReferenceCount()); + const s32 otherDock = dock->GetOtherDockNumber(dock->GetReferenceCount()); if (CObjectList* objs = mgr.GetWorld()->GetArea(aid)->GetAreaObjects()) { for (CEntity* ent : *objs) { @@ -82,11 +83,13 @@ void CScriptDock::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStat switch (msg) { case EScriptObjectMessage::Registered: { CGameArea* area = mgr.GetWorld()->GetArea(x260_area); - if (area->GetDockCount() < x25c_dock) + if (area->GetDockCount() < x25c_dock) { return; + } IGameArea::Dock* dock = area->GetDock(x25c_dock); - if (!dock->IsReferenced()) + if (!dock->IsReferenced()) { dock->SetReferenceCount(x258_dockReferenceCount); + } } break; case EScriptObjectMessage::Deleted: CleanUp(); @@ -96,32 +99,35 @@ void CScriptDock::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStat break; case EScriptObjectMessage::WorldInitialized: { UpdateAreaActivateFlags(mgr); - CMaterialList exclude = GetMaterialFilter().GetExcludeList(); + const CMaterialList exclude = GetMaterialFilter().GetExcludeList(); CMaterialList include = GetMaterialFilter().GetIncludeList(); include.Add(EMaterialTypes::AIBlock); SetMaterialFilter(CMaterialFilter::MakeIncludeExclude(include, exclude)); } break; case EScriptObjectMessage::SetToZero: { - if (mgr.GetNextAreaId() != x260_area) + if (mgr.GetNextAreaId() != x260_area) { return; + } SetLoadConnected(mgr, false); - CGameArea* area = mgr.GetWorld()->GetArea(x260_area); - IGameArea::Dock* dock = area->GetDock(x25c_dock); + const CGameArea* area = mgr.GetWorld()->GetArea(x260_area); + const IGameArea::Dock* dock = area->GetDock(x25c_dock); - TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount()); + const TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount()); CPlatformAndDoorList& lst = mgr.GetPlatformAndDoorObjectList(); for (CEntity* ent : lst) { - TCastToPtr door(ent); - if (door && door->IsConnectedToArea(mgr, aid)) + const TCastToPtr door(ent); + if (door && door->IsConnectedToArea(mgr, aid)) { door->ForceClosed(mgr); + } } } break; case EScriptObjectMessage::SetToMax: - if (mgr.GetNextAreaId() != x260_area) + if (mgr.GetNextAreaId() != x260_area) { return; + } SetLoadConnected(mgr, true); break; @@ -131,13 +137,14 @@ void CScriptDock::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStat case EScriptObjectMessage::Decrement: { TAreaId aid = x260_area; if (mgr.GetNextAreaId() == x260_area) { - IGameArea::Dock* dock = mgr.GetWorld()->GetArea(x260_area)->GetDock(x25c_dock); + const IGameArea::Dock* dock = mgr.GetWorld()->GetArea(x260_area)->GetDock(x25c_dock); aid = dock->GetConnectedAreaId(dock->GetReferenceCount()); } - if (aid >= 0 && aid < mgr.GetWorld()->GetNumAreas() && mgr.GetWorld()->GetArea(aid)->GetActive()) + if (aid >= 0 && aid < mgr.GetWorld()->GetNumAreas() && mgr.GetWorld()->GetArea(aid)->GetActive()) { CWorld::PropogateAreaChain(CGameArea::EOcclusionState(msg == EScriptObjectMessage::Increment), mgr.GetWorld()->GetArea(aid), mgr.GetWorld()); + } } break; default: CPhysicsActor::AcceptScriptMsg(msg, uid, mgr); @@ -154,11 +161,13 @@ std::optional CScriptDock::GetTouchBounds() const { } void CScriptDock::Touch(CActor& act, CStateManager&) { - if (x264_dockState == EDockState::Three) + if (x264_dockState == EDockState::Three) { return; + } - if (TCastToPtr(act)) + if (TCastToConstPtr(act)) { x264_dockState = EDockState::PlayerTouched; + } } zeus::CPlane CScriptDock::GetPlane(const CStateManager& mgr) const { @@ -176,11 +185,14 @@ s32 CScriptDock::GetDockReference(const CStateManager& mgr) const { } TAreaId CScriptDock::GetCurrentConnectedAreaId(const CStateManager& mgr) const { - if (x260_area >= mgr.GetWorld()->GetNumAreas()) + if (x260_area >= mgr.GetWorld()->GetNumAreas()) { return kInvalidAreaId; + } + const CGameArea* area = mgr.GetWorld()->GetAreaAlways(x260_area); - if (x25c_dock >= area->GetDockCount()) + if (x25c_dock >= area->GetDockCount()) { return kInvalidAreaId; + } const IGameArea::Dock* dock = area->GetDock(x25c_dock); return dock->GetConnectedAreaId(dock->GetReferenceCount()); @@ -188,21 +200,22 @@ TAreaId CScriptDock::GetCurrentConnectedAreaId(const CStateManager& mgr) const { void CScriptDock::UpdateAreaActivateFlags(CStateManager& mgr) { CWorld* world = mgr.GetWorld(); - if (x260_area >= world->GetNumAreas()) + if (x260_area >= world->GetNumAreas()) { return; + } CGameArea* area = world->GetArea(x260_area); - if (x25c_dock >= area->GetDockCount()) return; - IGameArea::Dock* dock = area->GetDock(x25c_dock); + const IGameArea::Dock* dock = area->GetDock(x25c_dock); for (s32 i = 0; i < dock->GetDockRefs().size(); ++i) { - s32 dockRefCount = dock->GetReferenceCount(); - TAreaId aid = dock->GetConnectedAreaId(i); - if (aid != kInvalidAreaId) + const s32 dockRefCount = dock->GetReferenceCount(); + const TAreaId aid = dock->GetConnectedAreaId(i); + if (aid != kInvalidAreaId) { world->GetArea(aid)->SetActive(i == dockRefCount); + } } mgr.SetCurrentAreaId(mgr.GetNextAreaId()); } @@ -216,9 +229,10 @@ void CScriptDock::AreaLoaded(CStateManager& mgr) { SetLoadConnected(mgr, x268_25 void CScriptDock::SetLoadConnected(CStateManager& mgr, bool loadOther) { IGameArea::Dock* dock = mgr.GetWorld()->GetArea(x260_area)->GetDock(x25c_dock); - bool cur = dock->GetShouldLoadOther(dock->GetReferenceCount()); - if (cur == loadOther) + const bool cur = dock->GetShouldLoadOther(dock->GetReferenceCount()); + if (cur == loadOther) { return; + } dock->SetShouldLoadOther(dock->GetReferenceCount(), loadOther); }