zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-04 02:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into parser

Browse Source
This commit is contained in:
Benjamin HENRY
2021-06-17 21:54:54 +02:00
committed by GitHub
parent d51569b480 2ff8230c35
commit 93c8fb1192
75 changed files with 1812 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Items/Bonus.cpp
+5
View File
@@ -2,6 +2,7 @@
// Created by HENRY Benjamin on 02/06/2021.
//
#include <Component/Collision/CollisionComponent.hpp>
#include <Component/Collision/CollisionComponent.hpp>
#include <Component/Controllable/ControllableComponent.hpp>
#include <Component/Bonus/PlayerBonusComponent.hpp>
@@ -20,6 +21,7 @@ namespace BBM {
if (!bombHolder)
return;
bombHolder->maxBombCount++;
const_cast<WAL::Entity &>(bonus).scheduleDeletion();
}
void Bonus::ExplosionRangeBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
@@ -31,6 +33,7 @@ namespace BBM {
if (!bombHolder || !playerBonus)
return;
bombHolder->explosionRadius++;
const_cast<WAL::Entity &>(bonus).scheduleDeletion();
}
void Bonus::SpeedUpBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
@@ -42,6 +45,7 @@ namespace BBM {
if (!controllable || !playerBonus)
return;
controllable->speed += 0.025f;
const_cast<WAL::Entity &>(bonus).scheduleDeletion();
}
void Bonus::NoClipBonus(WAL::Entity &player, const WAL::Entity &bonus, CollisionComponent::CollidedAxis axis)
@@ -53,6 +57,7 @@ namespace BBM {
return;
playerBonus->nextNoClipRate = playerBonus->noClipBonusRate;
playerBonus->isNoClipOn = true;
const_cast<WAL::Entity &>(bonus).scheduleDeletion();
}
Bonus::BonusType Bonus::getRandomBonusType()