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

Merge branch 'FMOD'

Browse Source 
Conflicts:
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Systems/PhysicsSystem.cpp
	src/Systems/PhysicsSystem.h
	src/Systems/SoundSystem.cpp
	src/Systems/SoundSystem.h
	vs11/Returngeance/Returngeance.vcxproj
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Stiffly
2014-06-02 18:49:16 +02:00
parent 2f2154ffe1 4ac67a22ac
commit 98399c3995
72 changed files with 4778 additions and 6461 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/World.cpp
+5 -5
View File
@@ -155,11 +155,11 @@ void World::AddComponent(EntityID entity, std::string componentType, std::shared
component->Entity = entity;
m_ComponentsOfType[componentType].push_back(component);
m_EntityComponents[entity][componentType] = component;
for (auto pair : m_Systems)
{
auto system = pair.second;
system->OnComponentCreated(componentType, component);
}
Events::ComponentCreated e;
e.Entity = entity;
e.Component = component;
EventBroker->Publish(e);
}
EntityID World::CloneEntity(EntityID entity, EntityID parent /* = 0 */)