BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
ViktorLjung
2014-06-05 06:01:49 +02:00
parent 56e6545f0f
commit e4a59cec61
31 changed files with 288 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Systems/GarageSystem.cpp
+21
View File
@@ -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);