1 files changed, 20 insertions, 12 deletions

@@ -5,34 +5,42 @@ void Entity::addComponent(std::shared_ptr<Component> c)
   components.push_back(c);
 }
 
-void Entity::send(message_t msg)
+void Entity::send(Game& game, Message& msg)
 {
-  for (auto it = components.begin(); it != components.end(); it++)
+  for (auto component : components)
   {
-    (*it)->receive(msg);
+    component->receive(game, *this, msg);
   }
 }
 
-void Entity::tick()
+void Entity::tick(Game& game)
 {
-  for (auto it = components.begin(); it != components.end(); it++)
+  for (auto component : components)
   {
-    (*it)->tick();
+    component->tick(game, *this);
   }
 }
 
-void Entity::input(int key, int action)
+void Entity::input(Game& game, int key, int action)
 {
-  for (auto it = components.begin(); it != components.end(); it++)
+  for (auto component : components)
   {
-    (*it)->input(key, action);
+    component->input(game, *this, key, action);
   }
 }
 
-void Entity::render(Texture* buffer)
+void Entity::render(Game& game, Texture& buffer)
 {
-  for (auto it = components.begin(); it != components.end(); it++)
+  for (auto component : components)
   {
-    (*it)->render(buffer);
+    component->render(game, *this, buffer);
+  }
+}
+
+void Entity::detectCollision(Game& game, Entity& collider, std::pair<double, double> old_position)
+{
+  for (auto component : components)
+  {
+    component->detectCollision(game, *this, collider, old_position);
   }
 }