From b5264bea3ea11dd2a5989aacae256ed47ae24eab Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@sdg.moe>
Date: Wed, 9 Jun 2021 12:30:14 +0200
Subject: [PATCH] Making bombs collidables. For now thats not really a good
 idea

---
 sources/Map/Map.cpp                            | 2 +-
 sources/System/BombHolder/BombHolderSystem.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sources/Map/Map.cpp b/sources/Map/Map.cpp
index f92976cb..891fb0dd 100644
--- a/sources/Map/Map.cpp
+++ b/sources/Map/Map.cpp
@@ -24,7 +24,7 @@ namespace BBM
 		if (collidedAxis & CollisionComponent::CollidedAxis::X)
 			mov->_velocity.x = 0;
 		if (collidedAxis & CollisionComponent::CollidedAxis::Y)
-			mov->_velocity.x = 0;
+			mov->_velocity.y = 0;
 		if (collidedAxis & CollisionComponent::CollidedAxis::Z)
 			mov->_velocity.z = 0;
 	}
diff --git a/sources/System/BombHolder/BombHolderSystem.cpp b/sources/System/BombHolder/BombHolderSystem.cpp
index e9ff4ab5..8b4a9c78 100644
--- a/sources/System/BombHolder/BombHolderSystem.cpp
+++ b/sources/System/BombHolder/BombHolderSystem.cpp
@@ -8,6 +8,7 @@
 #include "BombHolderSystem.hpp"
 #include "Component/Health/HealthComponent.hpp"
 #include <functional>
+#include <Map/Map.hpp>
 #include "Component/Collision/CollisionComponent.hpp"
 #include "Component/Tag/TagComponent.hpp"
 
@@ -53,6 +54,8 @@ namespace BBM
 		this->_wal.scene->scheduleNewEntity("Bomb")
 			.addComponent<PositionComponent>(position.round())
 			.addComponent<TimerComponent>(BombHolderSystem::explosionTimer, &BombHolderSystem::_bombExplosion)
+			.addComponent<CollisionComponent>(WAL::Callback<WAL::Entity &, const WAL::Entity &, CollisionComponent::CollidedAxis>(),
+			                                  &MapGenerator::wallCollide, 0.25, .75)
 			.addComponent<Drawable3DComponent, RAY3D::Model>("assets/bombs/bomb.obj",
 				std::make_pair(MAP_DIFFUSE, "assets/bombs/bomb_normal.png"));
 	}