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

2014-05-28 20:29:28 +02:00
parent 133473b00e cc42b94000
commit 75e8ae0265
62 changed files with 2468 additions and 1626 deletions
@@ -37,8 +37,9 @@ namespace Systems
 	class TankSteeringSystem : public System
 	{
 	public:
-		TankSteeringSystem(World* world, std::shared_ptr<::EventBroker> eventBroker)
-			: System(world, eventBroker) { }
+		TankSteeringSystem(World* world, std::shared_ptr<::EventBroker> eventBroker, std::shared_ptr<::ResourceManager> resourceManager)
+			: System(world, eventBroker, resourceManager)
+		{ }

 		void RegisterComponents(ComponentFactory* cf) override;
 		void Initialize() override;