New code style refactor

Runtime/World/CScriptDock.cpp

@@ -9,15 +9,13 @@
 #include "Particle/CGenDescription.hpp"
 #include "TCastTo.hpp"
 
-namespace urde
-{
-CMaterialList MakeDockMaterialList()
-{
-    CMaterialList list;
-    list.Add(EMaterialTypes::Trigger);
-    list.Add(EMaterialTypes::Immovable);
-    list.Add(EMaterialTypes::AIBlock);
-    return list;
+namespace urde {
+CMaterialList MakeDockMaterialList() {
+  CMaterialList list;
+  list.Add(EMaterialTypes::Trigger);
+  list.Add(EMaterialTypes::Immovable);
+  list.Add(EMaterialTypes::AIBlock);
+  return list;
 }
 
 CScriptDock::CScriptDock(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CVector3f position,
@@ -28,233 +26,201 @@ CScriptDock::CScriptDock(TUniqueId uid, std::string_view name, const CEntityInfo
                 SMoverData(1.f), CActorParameters::None(), 0.3f, 0.1f)
 , x258_dockReferenceCount(dockReferenceCount)
 , x25c_dock(dock)
-, x260_area(area)
-{
-    x268_25_loadConnected = loadConnected;
+, x260_area(area) {
+  x268_25_loadConnected = loadConnected;
 }
 
 void CScriptDock::Accept(IVisitor& visitor) { visitor.Visit(this); }
 
-void CScriptDock::Think(float dt, CStateManager& mgr)
-{
-    if (!GetActive())
-    {
-        UpdateAreaActivateFlags(mgr);
-        x268_24_dockReferenced = false;
-    }
+void CScriptDock::Think(float dt, CStateManager& mgr) {
+  if (!GetActive()) {
+    UpdateAreaActivateFlags(mgr);
+    x268_24_dockReferenced = false;
+  }
 
-    const IGameArea::Dock* gameDock = mgr.WorldNC()->GetArea(x260_area)->GetDock(x25c_dock);
-    TAreaId connArea = gameDock->GetConnectedAreaId(gameDock->GetReferenceCount());
-    if (connArea != kInvalidAreaId)
-    {
-        bool connPostConstructed = mgr.WorldNC()->GetArea(connArea)->IsPostConstructed();
-        if (x268_26_areaPostConstructed != connPostConstructed)
-        {
-            x268_26_areaPostConstructed = connPostConstructed;
-            if (connPostConstructed)
-                CEntity::SendScriptMsgs(EScriptObjectState::MaxReached, mgr, EScriptObjectMessage::None);
-            else
-                CEntity::SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None);
+  const IGameArea::Dock* gameDock = mgr.WorldNC()->GetArea(x260_area)->GetDock(x25c_dock);
+  TAreaId connArea = gameDock->GetConnectedAreaId(gameDock->GetReferenceCount());
+  if (connArea != kInvalidAreaId) {
+    bool connPostConstructed = mgr.WorldNC()->GetArea(connArea)->IsPostConstructed();
+    if (x268_26_areaPostConstructed != connPostConstructed) {
+      x268_26_areaPostConstructed = connPostConstructed;
+      if (connPostConstructed)
+        CEntity::SendScriptMsgs(EScriptObjectState::MaxReached, mgr, EScriptObjectMessage::None);
+      else
+        CEntity::SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None);
+    }
+  }
+
+  if (mgr.GetNextAreaId() != x260_area)
+    x264_dockState = EDockState::Three;
+  else if (x264_dockState == EDockState::Three)
+    x264_dockState = EDockState::Idle;
+  else if (x264_dockState == EDockState::PlayerTouched)
+    x264_dockState = EDockState::EnterNextArea;
+  else if (x264_dockState == EDockState::EnterNextArea) {
+    CPlayer& player = mgr.GetPlayer();
+    if (HasPointCrossedDock(mgr, player.GetTranslation())) {
+      IGameArea::Dock* dock = mgr.WorldNC()->GetArea(mgr.GetNextAreaId())->DockNC(x25c_dock);
+      TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
+      if (aid != kInvalidAreaId && mgr.WorldNC()->GetArea(aid)->GetActive()) {
+        mgr.SetCurrentAreaId(aid);
+        s32 otherDock = dock->GetOtherDockNumber(dock->GetReferenceCount());
+
+        if (CObjectList* objs = mgr.WorldNC()->GetArea(aid)->GetAreaObjects()) {
+          for (CEntity* ent : *objs) {
+            TCastToPtr<CScriptDock> dock(ent);
+            if (dock && dock->GetDockId() == otherDock)
+              dock->SetLoadConnected(mgr, true);
+          }
         }
+      }
     }
 
+    x264_dockState = EDockState::Idle;
+  }
+}
+
+void CScriptDock::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) {
+  switch (msg) {
+  case EScriptObjectMessage::Registered: {
+    CGameArea* area = mgr.WorldNC()->GetArea(x260_area);
+    if (area->GetDockCount() < x25c_dock)
+      return;
+    IGameArea::Dock* dock = area->DockNC(x25c_dock);
+    if (!dock->IsReferenced())
+      dock->SetReferenceCount(x258_dockReferenceCount);
+  } break;
+  case EScriptObjectMessage::Deleted:
+    CleanUp();
+    break;
+  case EScriptObjectMessage::InitializedInArea:
+    AreaLoaded(mgr);
+    break;
+  case EScriptObjectMessage::WorldInitialized: {
+    UpdateAreaActivateFlags(mgr);
+    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)
-        x264_dockState = EDockState::Three;
-    else if (x264_dockState == EDockState::Three)
-        x264_dockState = EDockState::Idle;
-    else if (x264_dockState == EDockState::PlayerTouched)
-        x264_dockState = EDockState::EnterNextArea;
-    else if (x264_dockState == EDockState::EnterNextArea)
-    {
-        CPlayer& player = mgr.GetPlayer();
-        if (HasPointCrossedDock(mgr, player.GetTranslation()))
-        {
-            IGameArea::Dock* dock = mgr.WorldNC()->GetArea(mgr.GetNextAreaId())->DockNC(x25c_dock);
-            TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
-            if (aid != kInvalidAreaId && mgr.WorldNC()->GetArea(aid)->GetActive())
-            {
-                mgr.SetCurrentAreaId(aid);
-                s32 otherDock = dock->GetOtherDockNumber(dock->GetReferenceCount());
+      return;
 
-                if (CObjectList* objs = mgr.WorldNC()->GetArea(aid)->GetAreaObjects())
-                {
-                    for (CEntity* ent : *objs)
-                    {
-                        TCastToPtr<CScriptDock> dock(ent);
-                        if (dock && dock->GetDockId() == otherDock)
-                            dock->SetLoadConnected(mgr, true);
-                    }
-                }
-            }
-        }
-
-        x264_dockState = EDockState::Idle;
-    }
-}
-
-void CScriptDock::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr)
-{
-    switch (msg)
-    {
-    case EScriptObjectMessage::Registered:
-    {
-        CGameArea* area = mgr.WorldNC()->GetArea(x260_area);
-        if (area->GetDockCount() < x25c_dock)
-            return;
-        IGameArea::Dock* dock = area->DockNC(x25c_dock);
-        if (!dock->IsReferenced())
-            dock->SetReferenceCount(x258_dockReferenceCount);
-    }
-    break;
-    case EScriptObjectMessage::Deleted:
-        CleanUp();
-        break;
-    case EScriptObjectMessage::InitializedInArea:
-        AreaLoaded(mgr);
-        break;
-    case EScriptObjectMessage::WorldInitialized:
-    {
-        UpdateAreaActivateFlags(mgr);
-        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)
-            return;
-
-        SetLoadConnected(mgr, false);
-
-        CGameArea* area = mgr.WorldNC()->GetArea(x260_area);
-        IGameArea::Dock* dock = area->DockNC(x25c_dock);
-
-        TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
-
-        CPlatformAndDoorList& lst = mgr.GetPlatformAndDoorObjectList();
-        for (CEntity* ent : lst)
-        {
-            TCastToPtr<CScriptDoor> door(ent);
-            if (door && door->IsConnectedToArea(mgr, aid))
-                door->ForceClosed(mgr);
-        }
-    }
-    break;
-    case EScriptObjectMessage::SetToMax:
-        if (mgr.GetNextAreaId() != x260_area)
-            return;
-
-        SetLoadConnected(mgr, true);
-        break;
-    case EScriptObjectMessage::Increment:
-        SetLoadConnected(mgr, true);
-        [[fallthrough]];
-    case EScriptObjectMessage::Decrement:
-    {
-        TAreaId aid = x260_area;
-        if (mgr.GetNextAreaId() == x260_area)
-        {
-            IGameArea::Dock* dock = mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock);
-            aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
-        }
-
-        if (aid >= 0 && aid < mgr.GetWorld()->GetNumAreas() && mgr.WorldNC()->GetArea(aid)->GetActive())
-            CWorld::PropogateAreaChain(CGameArea::EOcclusionState(msg == EScriptObjectMessage::Increment),
-                                       mgr.WorldNC()->GetArea(aid), mgr.WorldNC());
-    }
-    break;
-    default:
-        CPhysicsActor::AcceptScriptMsg(msg, uid, mgr);
-        break;
-    }
-}
-
-std::experimental::optional<zeus::CAABox> CScriptDock::GetTouchBounds() const
-{
-    if (x264_dockState == EDockState::Three)
-        return {};
-
-    return GetBoundingBox();
-}
-
-void CScriptDock::Touch(CActor& act, CStateManager&)
-{
-    if (x264_dockState == EDockState::Three)
-        return;
-
-    if (TCastToPtr<CPlayer>(act))
-        x264_dockState = EDockState::PlayerTouched;
-}
-
-zeus::CPlane CScriptDock::GetPlane(const CStateManager& mgr) const
-{
-    const IGameArea::Dock* dock = mgr.GetWorld()->GetAreaAlways(x260_area)->GetDock(x25c_dock);
-    return zeus::CPlane(dock->GetPoint(0), dock->GetPoint(1), dock->GetPoint(2));
-}
-
-void CScriptDock::SetDockReference(CStateManager& mgr, s32 ref)
-{
-    mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock)->SetReferenceCount(ref);
-    x268_24_dockReferenced = true;
-}
-
-s32 CScriptDock::GetDockReference(const CStateManager& mgr) const
-{
-    return mgr.GetWorld()->GetAreaAlways(x260_area)->GetDock(x25c_dock)->GetReferenceCount();
-}
-
-TAreaId CScriptDock::GetCurrentConnectedAreaId(const CStateManager& mgr) const
-{
-    if (x260_area >= mgr.GetWorld()->GetNumAreas())
-        return kInvalidAreaId;
-    const CGameArea* area = mgr.GetWorld()->GetAreaAlways(x260_area);
-    if (x25c_dock >= area->GetDockCount())
-        return kInvalidAreaId;
-
-    const IGameArea::Dock* dock = area->GetDock(x25c_dock);
-    return dock->GetConnectedAreaId(dock->GetReferenceCount());
-}
-
-void CScriptDock::UpdateAreaActivateFlags(CStateManager& mgr)
-{
-    CWorld* world = mgr.WorldNC();
-    if (x260_area >= world->GetNumAreas())
-        return;
-
-    CGameArea* area = world->GetArea(x260_area);
-
-    if (x25c_dock >= area->GetDockCount())
-        return;
+    SetLoadConnected(mgr, false);
 
+    CGameArea* area = mgr.WorldNC()->GetArea(x260_area);
     IGameArea::Dock* dock = area->DockNC(x25c_dock);
 
-    for (s32 i = 0; i < dock->GetDockRefs().size(); ++i)
-    {
-        s32 dockRefCount = dock->GetReferenceCount();
-        TAreaId aid = dock->GetConnectedAreaId(i);
-        if (aid != kInvalidAreaId)
-            world->GetArea(aid)->SetActive(i == dockRefCount);
+    TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
+
+    CPlatformAndDoorList& lst = mgr.GetPlatformAndDoorObjectList();
+    for (CEntity* ent : lst) {
+      TCastToPtr<CScriptDoor> door(ent);
+      if (door && door->IsConnectedToArea(mgr, aid))
+        door->ForceClosed(mgr);
     }
-    mgr.SetCurrentAreaId(mgr.GetNextAreaId());
+  } break;
+  case EScriptObjectMessage::SetToMax:
+    if (mgr.GetNextAreaId() != x260_area)
+      return;
+
+    SetLoadConnected(mgr, true);
+    break;
+  case EScriptObjectMessage::Increment:
+    SetLoadConnected(mgr, true);
+    [[fallthrough]];
+  case EScriptObjectMessage::Decrement: {
+    TAreaId aid = x260_area;
+    if (mgr.GetNextAreaId() == x260_area) {
+      IGameArea::Dock* dock = mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock);
+      aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
+    }
+
+    if (aid >= 0 && aid < mgr.GetWorld()->GetNumAreas() && mgr.WorldNC()->GetArea(aid)->GetActive())
+      CWorld::PropogateAreaChain(CGameArea::EOcclusionState(msg == EScriptObjectMessage::Increment),
+                                 mgr.WorldNC()->GetArea(aid), mgr.WorldNC());
+  } break;
+  default:
+    CPhysicsActor::AcceptScriptMsg(msg, uid, mgr);
+    break;
+  }
 }
 
-bool CScriptDock::HasPointCrossedDock(const CStateManager& mgr, const zeus::CVector3f& point) const
-{
-    const zeus::CPlane plane = GetPlane(mgr);
-    return plane.pointToPlaneDist(point) >= 0.f;
+std::experimental::optional<zeus::CAABox> CScriptDock::GetTouchBounds() const {
+  if (x264_dockState == EDockState::Three)
+    return {};
+
+  return GetBoundingBox();
+}
+
+void CScriptDock::Touch(CActor& act, CStateManager&) {
+  if (x264_dockState == EDockState::Three)
+    return;
+
+  if (TCastToPtr<CPlayer>(act))
+    x264_dockState = EDockState::PlayerTouched;
+}
+
+zeus::CPlane CScriptDock::GetPlane(const CStateManager& mgr) const {
+  const IGameArea::Dock* dock = mgr.GetWorld()->GetAreaAlways(x260_area)->GetDock(x25c_dock);
+  return zeus::CPlane(dock->GetPoint(0), dock->GetPoint(1), dock->GetPoint(2));
+}
+
+void CScriptDock::SetDockReference(CStateManager& mgr, s32 ref) {
+  mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock)->SetReferenceCount(ref);
+  x268_24_dockReferenced = true;
+}
+
+s32 CScriptDock::GetDockReference(const CStateManager& mgr) const {
+  return mgr.GetWorld()->GetAreaAlways(x260_area)->GetDock(x25c_dock)->GetReferenceCount();
+}
+
+TAreaId CScriptDock::GetCurrentConnectedAreaId(const CStateManager& mgr) const {
+  if (x260_area >= mgr.GetWorld()->GetNumAreas())
+    return kInvalidAreaId;
+  const CGameArea* area = mgr.GetWorld()->GetAreaAlways(x260_area);
+  if (x25c_dock >= area->GetDockCount())
+    return kInvalidAreaId;
+
+  const IGameArea::Dock* dock = area->GetDock(x25c_dock);
+  return dock->GetConnectedAreaId(dock->GetReferenceCount());
+}
+
+void CScriptDock::UpdateAreaActivateFlags(CStateManager& mgr) {
+  CWorld* world = mgr.WorldNC();
+  if (x260_area >= world->GetNumAreas())
+    return;
+
+  CGameArea* area = world->GetArea(x260_area);
+
+  if (x25c_dock >= area->GetDockCount())
+    return;
+
+  IGameArea::Dock* dock = area->DockNC(x25c_dock);
+
+  for (s32 i = 0; i < dock->GetDockRefs().size(); ++i) {
+    s32 dockRefCount = dock->GetReferenceCount();
+    TAreaId aid = dock->GetConnectedAreaId(i);
+    if (aid != kInvalidAreaId)
+      world->GetArea(aid)->SetActive(i == dockRefCount);
+  }
+  mgr.SetCurrentAreaId(mgr.GetNextAreaId());
+}
+
+bool CScriptDock::HasPointCrossedDock(const CStateManager& mgr, const zeus::CVector3f& point) const {
+  const zeus::CPlane plane = GetPlane(mgr);
+  return plane.pointToPlaneDist(point) >= 0.f;
 }
 
 void CScriptDock::AreaLoaded(CStateManager& mgr) { SetLoadConnected(mgr, x268_25_loadConnected); }
 
-void CScriptDock::SetLoadConnected(CStateManager& mgr, bool loadOther)
-{
-    IGameArea::Dock* dock = mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock);
-    bool cur = dock->GetShouldLoadOther(dock->GetReferenceCount());
-    if (cur == loadOther)
-        return;
+void CScriptDock::SetLoadConnected(CStateManager& mgr, bool loadOther) {
+  IGameArea::Dock* dock = mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock);
+  bool cur = dock->GetShouldLoadOther(dock->GetReferenceCount());
+  if (cur == loadOther)
+    return;
 
-    dock->SetShouldLoadOther(dock->GetReferenceCount(), loadOther);
+  dock->SetShouldLoadOther(dock->GetReferenceCount(), loadOther);
 }
 } // namespace urde