zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-27 16:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

doesn't compile

Browse Source
This commit is contained in:
Clément Le Bihan
2021-06-18 10:40:36 +02:00
parent a21c9c7a38
commit d9accd58bd
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Component/Controllable/ControllableComponent.hpp
-2
View File
@@ -37,8 +37,6 @@ namespace BBM
bool bomb = false;
//! @brief input value for pause
bool pause = false;
//! @brief The speed applied to every controllable entities.
float speed = .15f;
//! @brief The layout used for this controllable.
Layout layout = NONE;
sources/Component/Speed/SpeedComponent.hpp
+1 -1
View File
@@ -8,7 +8,7 @@
namespace BBM
{
class SpeedComponent : WAL::Component
class SpeedComponent : public WAL::Component
{
public:
//! @brief entity speed
sources/Items/Bonus.cpp
+4 -3
View File
@@ -5,6 +5,7 @@
#include <Component/Collision/CollisionComponent.hpp>
#include <Component/Collision/CollisionComponent.hpp>
#include <Component/Controllable/ControllableComponent.hpp>
#include "Component/Speed/SpeedComponent.hpp"
#include <Component/Bonus/PlayerBonusComponent.hpp>
#include "Component/Movable/MovableComponent.hpp"
#include "Bonus.hpp"
@@ -40,11 +41,11 @@ namespace BBM {
{
if (bonus.shouldDelete() || axis != CollisionComponent::CollidedAxis::ALL)
return;
auto *controllable = player.tryGetComponent<ControllableComponent>();
auto *speed = player.tryGetComponent<SpeedComponent>();
auto *playerBonus = player.tryGetComponent<PlayerBonusComponent>();
if (!controllable || !playerBonus)
if (!speed || !playerBonus)
return;
controllable->speed += 0.025f;
speed->speed += 0.025f;
const_cast<WAL::Entity &>(bonus).scheduleDeletion();
}
sources/System/Controllable/ControllableSystem.cpp
+3 -1
View File
@@ -6,6 +6,7 @@
#include "ControllableSystem.hpp"
#include "Component/Movable/MovableComponent.hpp"
#include "Component/Controllable/ControllableComponent.hpp"
#include "Component/Speed/SpeedComponent.hpp"
#include "Component/Health/HealthComponent.hpp"
#include "Entity/Entity.hpp"
@@ -18,9 +19,10 @@ namespace BBM
void ControllableSystem::onFixedUpdate(WAL::ViewEntity<ControllableComponent, MovableComponent> &entity)
{
auto &controllable = entity.get<ControllableComponent>();
auto &speed = entity.get<SpeedComponent>();
auto &movable = entity.get<MovableComponent>();
auto health = entity->tryGetComponent<HealthComponent>();
Vector2f move = controllable.move.normalized() * controllable.speed;
Vector2f move = controllable.move.normalized() * speed.speed;
if (health && health->getHealthPoint() <= 0)
return;