BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
This commit is contained in:
Adam
2014-03-13 03:01:53 +01:00
parent 76da942fdb 61b0d9e7d3
commit 192589f9e5
25 changed files with 410 additions and 36304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/World.h
+1 -1
View File
@@ -82,7 +82,7 @@ protected:
std::unordered_map<EntityID, EntityID> m_EntityParents ;
std::unordered_map<EntityID, std::unordered_map<std::string, boost::any>> m_EntityProperties;
std::unordered_map<std::string, std::vector<std::shared_ptr<Component>>> m_ComponentsOfType;
std::unordered_map<std::string, std::list<std::shared_ptr<Component>>> m_ComponentsOfType;
std::unordered_map<EntityID, std::map<std::string, std::shared_ptr<Component>>> m_EntityComponents;
EntityID GenerateEntityID();