Changeset 28138 for ps

Timestamp:

Jul 5, 2024, 6:55:33 PM (4 days ago)

Author:

phosit

Message:

Make the CSimContext constructor take a CTerrain and a CUnitManager

CSimulationImpl doesn't has to be a friend anymore.

Comments by: @Stan

Differential Revision: ​https://code.wildfiregames.com/D5296

Location:

ps/trunk/source/simulation2

Files:

• Simulation2.cpp (modified) (2 diffs)
• system/SimContext.cpp (modified) (2 diffs)
• system/SimContext.h (modified) (3 diffs)

ps/trunk/source/simulation2/Simulation2.cpp

@@ -55 +55 @@
 public:
     CSimulation2Impl(CUnitManager* unitManager, ScriptContext& cx, CTerrain* terrain) :
+
         m_ComponentManager{m_SimContext, cx},
         m_MapSettings{cx.GetGeneralJSContext()},
         m_InitAttributes{cx.GetGeneralJSContext()}
     {
-        m_SimContext.m_UnitManager = unitManager;
-        m_SimContext.m_Terrain = terrain;
         m_ComponentManager.LoadComponentTypes();
 
@@ -407 +406 @@
         m_SecondaryTerrain = std::make_unique<CTerrain>();
 
-        m_SecondaryContext = std::make_unique<CSimContext>();
-        m_SecondaryContext->m_Terrain = m_SecondaryTerrain.get();
+        m_SecondaryContext = std::make_unique<CSimContext>(m_SecondaryTerrain.get());
 
         m_SecondaryComponentManager = std::make_unique<CComponentManager>(*m_SecondaryContext, scriptInterface.GetContext());

ps/trunk/source/simulation2/system/SimContext.cpp

@@ -1 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -24 +24 @@
 #include "ps/Game.h"
 
-CSimContext::CSimContext() :
-    m_ComponentManager(NULL), m_UnitManager(NULL), m_Terrain(NULL)
+CSimContext::CSimContext(CTerrain* terrain /*= nullptr*/, CUnitManager* unitManager /*= nullptr*/) :
+    m_UnitManager{unitManager},
+    m_Terrain{terrain}
 {
 }

ps/trunk/source/simulation2/system/SimContext.h

@@ -1 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 20 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -33 +33 @@
 {
 public:
-    CSimContext();
+    CSimContext();
     ~CSimContext();
 
@@ -56 +56 @@
 
 private:
-    CComponentManager* m_ComponentManager;
+    CComponentManager* m_ComponentManager;
     CUnitManager* m_UnitManager;
     CTerrain* m_Terrain;
 
     CEntityHandle m_SystemEntity;
-
-    friend class CSimulation2Impl;
 };