Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)

src/Tests/CapturePointTest.cpp

@@ -94,7 +94,7 @@ CapturePointTest::CapturePointTest(int runTestNumber)
     m_World = new World();
 
     // Create system pipeline
-    m_SystemPipeline = new SystemPipeline(m_EventBroker);
+    m_SystemPipeline = new SystemPipeline(m_World,m_EventBroker);
     m_SystemPipeline->AddSystem<HealthSystem>(0);
     m_SystemPipeline->AddSystem<CapturePointSystem>(1);
 
@@ -405,7 +405,7 @@ void CapturePointTest::Tick()
     double dt = 10.0;
 
     // Iterate through systems and update world!
-    m_SystemPipeline->Update(m_World, dt);
+    m_SystemPipeline->Update(dt);
 
     m_EventBroker->Swap();
     m_EventBroker->Clear();

src/Tests/HealthSystemTest.cpp

@@ -48,7 +48,7 @@ GameHealthSystemTest::GameHealthSystemTest()
     fp.MergeEntities(m_World);
 
     // Create system pipeline
-    m_SystemPipeline = new SystemPipeline(m_EventBroker);
+    m_SystemPipeline = new SystemPipeline(m_World,m_EventBroker);
     m_SystemPipeline->AddSystem<HealthSystem>(0);
 
     //The Test

src/Tests/OctTreeTest.cpp

@@ -52,8 +52,7 @@ void RegionTestOld(Tree& tree)
 template<typename Tree>
 void RegionTest(Tree& tree)
 {
-    AABB aabb;
-    aabb.CreateFromCenter(glm::vec3(rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS),
+    AABB aabb = AABB::FromOriginSize(glm::vec3(rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS, rand() % LEVEL_BOUNDS),
         glm::vec3(rand() % MAXSIZE, rand() % MAXSIZE, rand() % MAXSIZE));
     std::vector<AABB> outVec;
     tree.ObjectsInSameRegion(aabb, outVec);