Merge remote-tracking branch 'origin/master' into havok

Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Events/Dead.h

@@ -0,0 +1,16 @@
+#ifndef Events_Dead_h__
+#define Events_Dead_h__
+#include "Entity.h"
+#include "EventBroker.h"
+
+namespace Events
+{
+	struct Dead : Event
+	{
+		EntityID Entity;
+	};
+}
+
+
+
+#endif // Events_Dead_h__

src/Events/FlagCaptured.h

@@ -8,7 +8,7 @@ namespace Events
 {
 	struct FlagCaptured : Event
 	{
-		EntityID Player;
+		unsigned int Player;
 	};
 }
 

src/Events/FlagDropped.h

@@ -8,7 +8,7 @@ namespace Events
 {
 	struct FlagDropped : Event
 	{
-		EntityID Player;
+		unsigned int Player;
 	};
 }
 

src/Events/FlagPickup.h

@@ -8,7 +8,7 @@ namespace Events
 {
 	struct FlagPickup : Event
 	{
-		EntityID Player;
+		unsigned int Player;
 	};
 }
 

src/Events/FlagReturned.h

@@ -8,7 +8,7 @@ namespace Events
 {
 	struct FlagReturned : Event
 	{
-		EntityID Player;
+		unsigned int Player;
 	};
 }
 

src/Events/GameOver.h

@@ -8,7 +8,7 @@ namespace Events
 {
 	struct GameOver : Event
 	{
-		EntityID Winner;
+		unsigned int Player;
 	};
 }
 

src/Events/OnDead.h

@@ -1,16 +0,0 @@
-#ifndef Events_OnDead_h__
-#define Events_OnDead_h__
-#include "Entity.h"
-#include "EventBroker.h"
-
-namespace Events
-{
-	struct OnDead : Event
-	{
-		EntityID Entity;
-	};
-}
-
-
-
-#endif // Events_OnDead_h__

src/GUI/GameFrame.h

@@ -11,6 +11,7 @@
 #include "GameWorld.h"
 #include "Events/GameStart.h"
 #include "Events/GameOver.h"
+#include "Events/Dead.h"
 
 namespace GUI
 {

src/GUI/HealthOverlay.h

@@ -37,7 +37,7 @@ namespace GUI
 			if (!health)
 				return false;
 	
-			SetColor(glm::vec4(1.f, 1.f, 1.f, 1 - health->Amount / 100.f));
+			SetColor(glm::vec4(1.f, 1.f, 1.f, 1 - (health->Amount / 100.f * 2)));
 
 			return true;
 		}

src/GUI/PlayerHUD.h

@@ -7,6 +7,7 @@
 #include "GUI/GameOverFrame.h"
 
 #include "Events/GameOver.h"
+#include "Events/Dead.h"
 #include "Components/Player.h"
 
 namespace GUI
@@ -20,7 +21,8 @@ namespace GUI
 			, m_World(world)
 			, m_PlayerID(playerID)
 		{
-			EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &GUI::PlayerHUD::OnGameOver)
+			EVENT_SUBSCRIBE_MEMBER(m_EGameOver, &GUI::PlayerHUD::OnGameOver);
+			EVENT_SUBSCRIBE_MEMBER(m_EDead, &GUI::PlayerHUD::OnDead);
 
 			m_HealthOverlay = new HealthOverlay(this, "HealthOverlay", m_World, m_PlayerID);
 
@@ -35,6 +37,7 @@ namespace GUI
 			m_VehicleSelection = new VehicleSelection(this, "VehicleSelection", m_World, m_PlayerID);
 
 			m_GameOverFrame = new GameOverFrame(this, "GameOver");
+			m_GameOverFrame->Hide();
 		}
 
 	protected:
@@ -49,14 +52,7 @@ namespace GUI
 		EventRelay<Frame, Events::GameOver> m_EGameOver;
 		bool OnGameOver(const Events::GameOver &event)
 		{
-			auto playerComponent = m_World->GetComponent<Components::Player>(event.Winner);
+			if (m_PlayerID == event.Player)
-			if (!playerComponent)
-			{
-				LOG_ERROR("Winner is not a valid player!");
-				return false;
-			}
-
-			if (m_PlayerID == playerComponent->ID)
 				m_GameOverFrame->Show(true);
 			else
 				m_GameOverFrame->Show(false);
@@ -64,6 +60,14 @@ namespace GUI
 			return true;
 		}
 
+		EventRelay<Frame, Events::Dead> m_EDead;
+		bool OnDead(const Events::Dead &event)
+		{
+			m_VehicleSelection->Show();
+			m_HealthOverlay->SetColor(glm::vec4(1, 1, 1, 0));
+			return true;
+		}
+
 		bool OnCommand(const Events::InputCommand &event)
 		{
 			if (event.PlayerID != m_PlayerID)
@@ -71,10 +75,10 @@ namespace GUI
 
 			if (event.Command == "interface_confirm" && event.Value > 0)
 			{
-				if (m_GameOverFrame->Visible())
+				/*if (m_GameOverFrame->Visible())
 				{
 					m_GameOverFrame->Hide();
-				}
+				}*/
 			}
 
 			return true;

src/GUI/Viewport.h

@@ -51,7 +51,7 @@ public:
 			return;
 
 		Components::Transform absoluteTransform = m_TransformSystem->AbsoluteTransform(m_CameraEntity);
-
+		
 		m_Camera->SetFOV(cameraComponent->FOV);
 		m_Camera->SetNearClip(cameraComponent->NearClip);
 		m_Camera->SetFarClip(cameraComponent->FarClip);

src/GameWorld.cpp

@@ -296,37 +296,7 @@ void GameWorld::Initialize()
 
 	
 
-	{
+	
-		auto flag = CreateEntity();
-		auto transform = AddComponent<Components::Transform>(flag);
-		transform->Position = glm::vec3(0, -50, 100);
-		auto model = AddComponent<Components::Model>(flag);
-		model->ModelFile = "Models/Flag/FishingRod/FishingRod.obj";
-		{
-			auto fish = CreateEntity(flag);
-			auto transform = AddComponent<Components::Transform>(fish);
-			transform->Position = glm::vec3(-1.3f, 1.0, 0);
-			auto model = AddComponent<Components::Model>(fish);
-			model->ModelFile = "Models/Flag/LeFish/Salmon.obj";
-			CommitEntity(fish);
-		}
-
-		auto trigger = AddComponent<Components::Trigger>(flag);
-		{
-			auto shape = CreateEntity(flag);
-			auto transform = AddComponent<Components::Transform>(shape);
-			transform->Position = glm::vec3(-0.9f, 0.9f, 0);
-			auto box = AddComponent<Components::BoxShape>(shape);
-			box->Width = 1.1f;
-			box->Depth = 0.7f;
-			box->Height = 3.9f;
-			CommitEntity(shape);
-		}
-
-		auto flagComponent = AddComponent<Components::Flag>(flag);
-
-		CommitEntity(flag);
-	}
 
 	//for (int i = 0; i < 500; i++)
 	//{
@@ -418,7 +388,6 @@ void GameWorld::RegisterComponents()
 	m_ComponentFactory.Register<Components::Transform>([]() { return new Components::Transform(); }); 
 	m_ComponentFactory.Register<Components::Template>([]() { return new Components::Template(); });	
 	m_ComponentFactory.Register<Components::Player>([]() { return new Components::Player(); });	
-	m_ComponentFactory.Register<Components::Flag>([]() { return new Components::Flag(); });
 	m_ComponentFactory.Register<Components::Move>([]() { return new Components::Move(); });
 	m_ComponentFactory.Register<Components::Rotate>([]() { return new Components::Rotate(); });
 	m_ComponentFactory.Register<Components::Team>([]() { return new Components::Team(); });
@@ -445,6 +414,8 @@ void GameWorld::RegisterSystems()
 	m_SystemFactory.Register<Systems::FollowSystem>([this]() { return new Systems::FollowSystem(this, EventBroker, ResourceManager); });
 	m_SystemFactory.Register<Systems::GarageSystem>([this]() { return new Systems::GarageSystem(this, EventBroker, ResourceManager); });
 	m_SystemFactory.Register<Systems::WallSystem>([this]() { return new Systems::WallSystem(this, EventBroker, ResourceManager); });
+	m_SystemFactory.Register<Systems::FlagSystem>([this]() { return new Systems::FlagSystem(this, EventBroker, ResourceManager); });
+	m_SystemFactory.Register<Systems::GameStateSystem>([this]() { return new Systems::GameStateSystem(this, EventBroker, ResourceManager); });
 	m_SystemFactory.Register<Systems::RenderSystem>([this]() { return new Systems::RenderSystem(this, EventBroker, ResourceManager); });
 }
 
@@ -469,6 +440,8 @@ void GameWorld::AddSystems()
 	AddSystem<Systems::FollowSystem>();
 	AddSystem<Systems::GarageSystem>();
 	AddSystem<Systems::WallSystem>();
+	AddSystem<Systems::FlagSystem>();
+	AddSystem<Systems::GameStateSystem>();
 	AddSystem<Systems::RenderSystem>();
 }
 
@@ -1096,6 +1069,8 @@ void GameWorld::CreateBase(glm::quat orientation, int teamID)
 	CreateWall(base, glm::vec3(273.f, 40.3f, 25.f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)));
 
 	CreateGarage(base, glm::vec3(323.2f, 41.4f, -10.2f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)), teamID);
+
+	CreateFlag(base, glm::vec3(291.f, 41.7412f, -36.2f), glm::quat(glm::vec3(0, glm::pi<float>() / 2.f, 0)), teamID);
 }
 
 EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int teamID)
@@ -1275,3 +1250,47 @@ EntityID GameWorld::CreateGarage(EntityID parent, glm::vec3 Position, glm::quat
 	
 	return garage;
 }
+
+void GameWorld::CreateFlag(EntityID parent, glm::vec3 position, glm::quat orientation, int TeamID)
+{
+	
+	auto flag = CreateEntity(parent);
+	SetProperty(flag, "Name", "Flag");
+	auto transform = AddComponent<Components::Transform>(flag);
+	transform->Position = position;
+	transform->Orientation = orientation;
+	auto flagComponent = AddComponent<Components::Flag>(flag);
+	auto trigger = AddComponent<Components::Trigger>(flag);
+	auto team = AddComponent<Components::Team>(flag);
+	team->TeamID = TeamID;
+	{
+		auto fish = CreateEntity(flag);
+		auto transform = AddComponent<Components::Transform>(fish);
+		transform->Position = glm::vec3(-1.3f, 1.0, 0);
+		auto model = AddComponent<Components::Model>(fish);
+		model->ModelFile = "Models/Flag/LeFish/Salmon.obj";
+		CommitEntity(fish);
+	}
+
+	{
+		auto rod = CreateEntity(flag);
+		auto transform = AddComponent<Components::Transform>(rod);
+		transform->Position = glm::vec3(-1.3f, 1.0, 0);
+		auto model = AddComponent<Components::Model>(rod);
+		model->ModelFile = "Models/Flag/FishingRod/FishingRod.obj";
+		CommitEntity(rod);
+	}
+	
+	{
+		auto shape = CreateEntity(flag);
+		auto transform = AddComponent<Components::Transform>(shape);
+		transform->Position = glm::vec3(-0.9f, 0.9f, 0);
+		auto box = AddComponent<Components::BoxShape>(shape);
+		box->Width = 1.1f;
+		box->Depth = 0.7f;
+		box->Height = 3.9f;
+		CommitEntity(shape);
+	}
+	CommitEntity(flag);
+	
+}

src/GameWorld.h

@@ -25,6 +25,8 @@
 #include "Systems/WallSystem.h"
 #include "Systems/GarageSystem.h"
 #include "Systems/JeepSteeringSystem.h"
+#include "Systems/FlagSystem.h"
+#include "Systems/GameStateSystem.h"
 
 #include "Components/Camera.h"
 #include "Components/DirectionalLight.h"
@@ -88,6 +90,7 @@ private:
 	EntityID CreateGarage(EntityID parent, glm::vec3 Position, glm::quat orientation, int teamID);
 	void CreateTerrain();
 	void CreateBase(glm::quat orientation, int playerID);
+	void CreateFlag(EntityID parent, glm::vec3 position, glm::quat orientation, int TeamID);
 	std::vector<EntityID> m_WallDebrisTemplates;
 };
 

src/Systems/DamageSystem.cpp

@@ -19,12 +19,14 @@ bool Systems::DamageSystem::OnDamage( const Events::Damage &event )
 		return false;
 	auto health = m_World->GetComponent<Components::Health>(event.Entity);
 	health->Amount -= event.Amount;
-	//if(health->Amount <= 0)
+	if(health->Amount <= 0)
-	//{
+	{
-	//	Events::OnDead e;
+		Events::Dead e;
-	//	e.Entity = event.Entity;
+		e.Entity = event.Entity;
-	//	EventBroker->Publish(e);
+		EventBroker->Publish(e);
-	//}
+	}
+		
+	
 	LOG_INFO("Damaged entity %i, Health left: %f", event.Entity, health->Amount);
 	return true;
 }

src/Systems/DamageSystem.h

@@ -6,7 +6,7 @@
 #include "Components/Health.h"
 #include "Components/DamageModel.h"
 #include "Events/Damage.h"
-#include "Events/OnDead.h"
+#include "Events/Dead.h"
 
 namespace Systems
 {

src/Systems/FlagSystem.cpp

@@ -0,0 +1,63 @@
+#include "PrecompiledHeader.h"
+#include "FlagSystem.h"
+#include "World.h"
+void Systems::FlagSystem::RegisterComponents( ComponentFactory* cf )
+{
+	cf->Register<Components::Flag>([]() { return new Components::Flag(); });
+}
+
+void Systems::FlagSystem::Initialize()
+{
+	EVENT_SUBSCRIBE_MEMBER(m_EEnterTrigger, &Systems::FlagSystem::OnEnterTrigger);
+}
+
+void Systems::FlagSystem::Update( double dt )
+{
+
+}
+
+void Systems::FlagSystem::UpdateEntity( double dt, EntityID entity, EntityID parent )
+{
+
+}
+
+bool Systems::FlagSystem::OnEnterTrigger( const Events::EnterTrigger &event )
+{
+	auto JeepSteeringComponent = m_World->GetComponent<Components::JeepSteering>(event.Entity);
+	if(!JeepSteeringComponent)
+		return false;
+
+	auto teamComponent = m_World->GetComponent<Components::Team>(event.Trigger);
+	auto playerComponent = m_World->GetComponent<Components::Player>(event.Entity);
+
+	if(!teamComponent || !playerComponent)
+		return false;
+	if (teamComponent->TeamID == playerComponent->ID)
+		return false;
+
+
+
+	auto flagComponent = m_World->GetComponent<Components::Flag>(event.Trigger);
+	if(!flagComponent)
+		return false;
+
+	PickUpFlag(event.Entity, event.Trigger);
+	
+	return true;
+}
+void Systems::FlagSystem::PickUpFlag( EntityID entity, EntityID trigger )
+{
+	m_World->RemoveComponent<Components::Trigger>(trigger);
+	m_World->SetEntityParent(trigger, entity);
+
+	auto triggerTransform = m_World->GetComponent<Components::Transform>(trigger);
+	triggerTransform->Position = glm::vec3(-1.5f, 0.1f, 2.f);
+
+	auto teamComponent = m_World->GetComponent<Components::Team>(trigger);
+	auto playerComponent = m_World->GetComponent<Components::Player>(entity);
+
+	Events::FlagPickup ePickup;
+	ePickup.Player = playerComponent->ID;
+	EventBroker->Publish(ePickup);
+}
+

src/Systems/FlagSystem.h

@@ -0,0 +1,44 @@
+#ifndef FlagSystem_h__
+#define FlagSystem_h__
+
+
+#include "System.h"
+#include "Components/Flag.h"
+#include "Components/Player.h"
+#include "Components/Team.h"
+#include "Components/Trigger.h"
+#include "Components/Transform.h"
+#include "Components/JeepSteering.h"
+
+#include "Events/FlagCaptured.h"
+#include "Events/FlagDropped.h"
+#include "Events/FlagPickup.h"
+#include "Events/FlagReturned.h"
+
+
+#include "Events/EnterTrigger.h"
+
+namespace Systems
+{
+	class FlagSystem : public System
+	{
+	public:
+
+		FlagSystem(World* world, std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<::ResourceManager> resourceManager)
+			: System(world, eventBroker, resourceManager) { }
+
+
+		void Initialize() override;
+		void RegisterComponents(ComponentFactory* cf) override;
+		void Update(double dt) override;
+		void UpdateEntity(double dt, EntityID entity, EntityID parent) override;
+
+	private:
+		EventRelay<FlagSystem, Events::EnterTrigger> m_EEnterTrigger;
+		bool OnEnterTrigger(const Events::EnterTrigger &event);
+
+		void PickUpFlag(EntityID entity, EntityID trigger);
+	};
+
+}
+#endif // DamageSystem_h__

src/Systems/GameStateSystem.cpp

@@ -12,7 +12,7 @@ bool Systems::GameStateSystem::OnFlagCaptured(const Events::FlagCaptured &event)
 	m_InGame = false;
 
 	Events::GameOver e;
-	e.Winner = event.Player;
+	e.Player = event.Player;
 	EventBroker->Publish(e);
 
 	return true;

src/Systems/GarageSystem.cpp

@@ -112,6 +112,27 @@ bool Systems::GarageSystem::OnCommand(const Events::InputCommand &event)
 
 				if (triggerTeamComponent->TeamID == entityPlayerComponent->ID)
 				{
+
+					auto components = m_World->GetComponentsOfType<Components::Flag>();
+
+					for (auto &component : *components)
+					{
+						auto teamComponent = m_World->GetComponent<Components::Team>(component->Entity);
+						if(!teamComponent)
+							continue;
+
+						auto parent = m_World->GetEntityParent(component->Entity);
+						if(parent != entity)
+							continue;
+
+						if(teamComponent->TeamID != entityPlayerComponent->ID)
+						{
+							Events::FlagCaptured e;
+							e.Player = entityPlayerComponent->ID;
+							EventBroker->Publish(e);
+						}
+					}
+
 					EntityID garage = m_World->GetEntityParent(trigger);
 					auto garageComponent = m_World->GetComponent<Components::Garage>(garage);
 					ToggleGarage(garageComponent);

src/Systems/GarageSystem.h

@@ -19,6 +19,8 @@
 #include "Components/Move.h"
 #include "Components/Rotate.h"
 #include "Components/Team.h"
+#include "Components/Flag.h"
+#include "Events/FlagCaptured.h"
 
 namespace Systems
 {

src/Systems/JeepSteeringSystem.cpp

@@ -102,7 +102,6 @@ EntityID Systems::JeepSteeringSystem::CreateJeep(int playerID)
 {
 	auto jeep = m_World->CreateEntity();
 	auto transform = m_World->AddComponent<Components::Transform>(jeep);
-	transform->Position = glm::vec3(0, 5, 0);
 	//transform->Orientation = glm::angleAxis(0.f, glm::vec3(0, 1, 0));
 	auto physics = m_World->AddComponent<Components::Physics>(jeep);
 	physics->Mass = 2000;

src/Systems/PhysicsSystem.cpp

@@ -39,6 +39,7 @@ void Systems::PhysicsSystem::Initialize()
 	EVENT_SUBSCRIBE_MEMBER(m_EApplyPointImpulse, &Systems::PhysicsSystem::OnApplyPointImpulse);
 	EVENT_SUBSCRIBE_MEMBER(m_EEnableCollisions, &Systems::PhysicsSystem::OnEnableCollisions);
 	EVENT_SUBSCRIBE_MEMBER(m_EDisableCollisions, &Systems::PhysicsSystem::OnDisableCollisions);
+	EVENT_SUBSCRIBE_MEMBER(m_EDead, &Systems::PhysicsSystem::OnDead);
 
 	hkMemorySystem::FrameInfo finfo(10000 * 1024);	// Allocate 10MB of Physics solver buffer
 	hkMemoryRouter* memoryRouter = hkMemoryInitUtil::initDefault(hkMallocAllocator::m_defaultMallocAllocator, finfo);
@@ -797,27 +798,19 @@ void Systems::PhysicsSystem::OnComponentRemoved(EntityID entity, std::string typ
 
 void Systems::PhysicsSystem::OnEntityRemoved( EntityID entity )
 {
-   	if(m_RigidBodies.find(entity) != m_RigidBodies.end())
+	/*
+   	else if(m_RigidBodies.find(entity) != m_RigidBodies.end())
 	{
-		LOG_INFO("Removed rigid body of entity %i", entity);
+		LOG_INFO("Removed rigid body of entity %i abogfusdkifbhdzfsgiudfhghdfhgdhfögödhfgödhfödhfödfjhödgfdgföuhudgf", entity);
+
 		m_PhysicsWorld->markForWrite();
-		m_RigidBodyEntities.erase(m_RigidBodies[entity]);
-		if(m_ListShapes.find(entity) != m_ListShapes.end())
-		{
-			m_ListShapes[entity]->removeReference();
-			m_ListShapes.erase(entity);
-		}
-		
 		m_PhysicsWorld->removeEntity(m_RigidBodies[entity]);
+		m_PhysicsWorld->unmarkForWrite();
+
 		m_RigidBodies.erase(entity);
-		m_PhysicsWorld->unmarkForWrite();
+		m_RigidBodyEntities.erase(m_RigidBodies[entity]);
-	}
+		
-	if(m_Vehicles.find(entity) != m_Vehicles.end())
+	}*/
-	{
-		m_PhysicsWorld->markForWrite();
-		m_Vehicles[entity]->removeFromWorld();
-		m_PhysicsWorld->unmarkForWrite();
-	}
 }
 
 bool Systems::PhysicsSystem::OnEnableCollisions( const Events::EnableCollisions &e )
@@ -900,3 +893,23 @@ bool Systems::PhysicsSystem::OnJeepSteer( const Events::JeepSteer &event )
 
 	return true;
 }
+
+bool Systems::PhysicsSystem::OnDead( const Events::Dead &e )
+{
+	if(m_Vehicles.find(e.Entity) != m_Vehicles.end())
+	{
+		EntityID camera = m_World->GetProperty<EntityID>(e.Entity, "Camera");
+		m_World->RemoveComponent<Components::Camera>(camera);
+		auto transform = m_World->GetComponent<Components::Transform>(e.Entity);
+		transform->Position = glm::vec3(0, -10000.f, 0);
+		m_RigidBodies[e.Entity]->setPosition(hkVector4(0, -10000, 0));
+
+		/*m_Vehicles.erase(e.Entity);
+		m_RigidBodyEntities.erase(m_RigidBodies[e.Entity]);
+		m_RigidBodies.erase(e.Entity);*/
+
+		m_World->RemoveComponent<Components::TankSteering>(e.Entity);
+		
+	}
+	return true;
+}

src/Systems/PhysicsSystem.h

@@ -86,9 +86,10 @@
 #include "Events/DisableCollisions.h"
 #include "Components/Trigger.h"
 #include "Components/Template.h"
-
+#include "Components/Camera.h"
 #include "Events/EnterTrigger.h"
 #include "Events/JeepSteer.h"
+#include "Events/Dead.h"
 
 namespace Systems
 {
@@ -192,6 +193,9 @@ private:
 	bool OnEnableCollisions(const Events::EnableCollisions &e);
 	EventRelay<PhysicsSystem, Events::DisableCollisions> m_EDisableCollisions;
 	bool OnDisableCollisions(const Events::DisableCollisions &e);
+	EventRelay<PhysicsSystem, Events::Dead> m_EDead;
+	bool OnDead(const Events::Dead &e);
+
 
 	void SetUpPhysicsState(EntityID entity, EntityID parent);
 	void TearDownPhysicsState(EntityID entity, EntityID parent);

src/Systems/TankSteeringSystem.cpp

@@ -461,7 +461,7 @@ EntityID Systems::TankSteeringSystem::CreateTank(int playerID)
 	auto tankSteering = m_World->AddComponent<Components::TankSteering>(tank);
 	m_World->AddComponent<Components::Input>(tank);
 	auto health = m_World->AddComponent<Components::Health>(tank);
-	health->Amount = 100.f;
+	health->Amount = 1.f;
 	m_World->AddComponent<Components::Listener>(tank);
 
 	{

src/Systems/TriggerSystem.cpp

@@ -53,19 +53,7 @@ bool Systems::TriggerSystem::OnEnterTrigger( const Events::EnterTrigger &event )
 	if (teamComponent->TeamID != playerComponent->ID)
 		return false;
 
-	auto flagComponent1 = m_World->GetComponent<Components::Flag>(event.Trigger);
+	
-	auto flagComponent2 = m_World->GetComponent<Components::Flag>(event.Entity);
-
-	 //HACK: SIMON IS DISSING AMERICA
-	if(flagComponent1)
-	{
-		Flag(event.Entity, event.Trigger);
-	}
-	else if (flagComponent2)
-	{
-		Flag(event.Trigger, event.Entity);
-	}
-
 
 	auto triggerMoveComponent = m_World->GetComponent<Components::TriggerMove>(event.Trigger);
 	if (triggerMoveComponent)
@@ -148,20 +136,6 @@ void Systems::TriggerSystem::Move(EntityID entity, bool queue, bool swap)
 	}
 }
 
-
-void Systems::TriggerSystem::Flag( EntityID entity, EntityID phantomEntity )
-{
-	auto tankSteering = m_World->GetComponent<Components::TankSteering>(entity);
-	if (!tankSteering)
-		return;
-
-	m_World->RemoveComponent<Components::Trigger>(phantomEntity);
-	m_World->SetEntityParent(phantomEntity, entity);
-	auto phantomTransform = m_World->GetComponent<Components::Transform>(phantomEntity);
-	phantomTransform->Position = glm::vec3(-1.5f, 0.1f, 2.f);
-}
-
-
 void Systems::TriggerSystem::Explosion( EntityID entity, EntityID phantomEntity )
 {
 	/*auto transformComponent = m_World->GetComponent<Components::Transform>(entity);

src/Systems/TriggerSystem.h

@@ -48,7 +48,6 @@ namespace Systems
 		EventRelay<TriggerSystem, Events::LeaveTrigger> m_ELeaveTrigger;
 		bool OnLeaveTrigger(const Events::LeaveTrigger &event);
 	private:
-		void Flag(EntityID entity, EntityID phantomEntity);
 		void Explosion(EntityID entity, EntityID phantomEntity);
 		void Move(EntityID entity, bool queue, bool swap);
 		void Rotate(EntityID entity, bool queue, bool swap);

src/Systems/WallSystem.h

@@ -4,7 +4,7 @@
 
 #include "System.h"
 #include "Systems/TransformSystem.h"
-#include "Events/OnDead.h"
+#include "Events/Dead.h"
 #include "Events/Damage.h"
 #include "Events/ApplyPointImpulse.h"
 #include "Components/Model.h"

src/World.cpp

@@ -78,14 +78,16 @@ bool World::ValidEntity(EntityID entity)
 
 void World::RemoveEntity(EntityID entity)
 {
-	m_EntitiesToRemove.insert(entity);
+	auto it = m_EntityChildren.find(entity);
-	for (auto pair : m_EntityParents)
+	if (it != m_EntityChildren.end())
 	{
-		if (pair.second == entity)
+		for (auto entity : it->second)
 		{
-			m_EntitiesToRemove.insert(pair.first);
+			m_EntitiesToRemove.insert(entity);
 		}
 	}
+
+	m_EntitiesToRemove.insert(entity);
 }
 
 void World::ProcessEntityRemovals()

vs11/Returngeance/Returngeance.vcxproj

@@ -109,6 +109,7 @@
     <ClCompile Include="..\..\src\ShaderProgram.cpp" />
     <ClCompile Include="..\..\src\Skybox.cpp" />
     <ClCompile Include="..\..\src\Sound.cpp" />
+    <ClCompile Include="..\..\src\Systems\FlagSystem.cpp" />
     <ClCompile Include="..\..\src\Systems\JeepSteeringSystem.cpp" />
     <ClCompile Include="..\..\src\Systems\DamageSystem.cpp" />
     <ClCompile Include="..\..\src\Systems\DebugSystem.cpp" />
@@ -214,7 +215,7 @@
     <ClInclude Include="..\..\src\Events\MouseMove.h" />
     <ClInclude Include="..\..\src\Events\MousePress.h" />
     <ClInclude Include="..\..\src\Events\MouseRelease.h" />
-    <ClInclude Include="..\..\src\Events\OnDead.h" />
+    <ClInclude Include="..\..\src\Events\Dead.h" />
     <ClInclude Include="..\..\src\Events\Move.h" />
     <ClInclude Include="..\..\src\Events\PlayBGM.h" />
     <ClInclude Include="..\..\src\Events\PlaySFX.h" />
@@ -251,6 +252,7 @@
     <ClInclude Include="..\..\src\Skybox.h" />
     <ClInclude Include="..\..\src\Sound.h" />
     <ClInclude Include="..\..\src\System.h" />
+    <ClInclude Include="..\..\src\Systems\FlagSystem.h" />
     <ClInclude Include="..\..\src\Systems\JeepSteeringSystem.h" />
     <ClInclude Include="..\..\src\Systems\DamageSystem.h" />
     <ClInclude Include="..\..\src\Systems\DebugSystem.h" />

vs11/Returngeance/Returngeance.vcxproj.filters

@@ -95,6 +95,9 @@
     <ClCompile Include="..\..\src\Systems\WallSystem.cpp">
       <Filter>Game\Systems</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\Systems\FlagSystem.cpp">
+      <Filter>Game\Systems</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Util">
@@ -585,7 +588,6 @@
     <ClInclude Include="..\..\src\Systems\JeepSteeringSystem.h">
       <Filter>Physics\Systems</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Events\OnDead.h" />
     <ClInclude Include="..\..\src\Systems\WallSystem.h" />
     <ClInclude Include="..\..\src\GUI\GameOverFrame.h">
       <Filter>GUI</Filter>
@@ -629,6 +631,10 @@
     <ClInclude Include="..\..\src\Components\DamageModel.h">
       <Filter>Rendering\Components</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\Systems\FlagSystem.h">
+      <Filter>Game\Systems</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\Events\Dead.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\Shaders\Fragment2.glsl">