zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-24 15:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge from develop

Browse Source
This commit is contained in:
EternalRat
2021-06-08 17:02:00 +02:00
parent 4af99e75e5 336acb211c
commit ee7b4c2c8f
13 changed files with 364 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Items/Bonus.cpp
+6 -5
View File
@@ -2,12 +2,13 @@
// Created by HENRY Benjamin on 02/06/2021.
//
#include <Component/Collision/CollisionComponent.hpp>
#include "Component/Movable/MovableComponent.hpp"
#include "Bonus.hpp"
#include "Component/BombHolder/BombHolderComponent.hpp"
namespace BBM {
void Bonus::BombUpBonus(WAL::Entity &player, const WAL::Entity &bonus)
void Bonus::BombUpBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
{
if (player.hasComponent<BombHolderComponent>()) {
auto &bombHolder = player.getComponent<BombHolderComponent>();
@@ -15,7 +16,7 @@ namespace BBM {
}
}
void Bonus::DamageIncreasedBonus(WAL::Entity &player, const WAL::Entity &bonus)
void Bonus::DamageIncreasedBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
{
if (player.hasComponent<BombHolderComponent>()) {
auto &bombHolder = player.getComponent<BombHolderComponent>();
@@ -24,7 +25,7 @@ namespace BBM {
}
}
void Bonus::ExplosionRangeBonus(WAL::Entity &player, const WAL::Entity &bonus)
void Bonus::ExplosionRangeBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
{
if (player.hasComponent<BombHolderComponent>()) {
auto &bombHolder = player.getComponent<BombHolderComponent>();
@@ -33,7 +34,7 @@ namespace BBM {
}
}
void Bonus::SpeedUpBonus(WAL::Entity &player, const WAL::Entity &bonus)
void Bonus::SpeedUpBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
{
if (!player.hasComponent<MovableComponent>())
return;
@@ -41,7 +42,7 @@ namespace BBM {
movable.addForce(Vector3f(1, 0, 1));
}
void Bonus::IgnoreWallsBonus(WAL::Entity &player, const WAL::Entity &bonus)
void Bonus::IgnoreWallsBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
{
if (player.hasComponent<BombHolderComponent>()) {
auto &bombHolder = player.getComponent<BombHolderComponent>();