zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-06 19:22:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Bluub
2021-06-07 16:23:02 +02:00
parent 75f6b04e9a 30a7da899f
commit 7a8a76c845
83 changed files with 1523 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/IAControllable/IAControllableSystem.cpp
+5 -6
View File
@@ -8,9 +8,8 @@
namespace BBM
{
IAControllableSystem::IAControllableSystem()
: WAL::System({ typeid(IAControllableComponent),
typeid(ControllableComponent)})
IAControllableSystem::IAControllableSystem(WAL::Wal &wal)
: System(wal)
{ }
float IAControllableSystem::getReturnNumber(lua_State *state)
@@ -40,10 +39,10 @@ namespace BBM
return res;
}
void IAControllableSystem::onFixedUpdate(WAL::Entity &entity)
void IAControllableSystem::onFixedUpdate(WAL::ViewEntity<ControllableComponent, IAControllableComponent> &entity)
{
auto &ia = entity.getComponent<IAControllableComponent>();
auto &controllable = entity.getComponent<ControllableComponent>();
auto &ia = entity.get<IAControllableComponent>();
auto &controllable = entity.get<ControllableComponent>();
lua_getglobal(ia.state, "Update");
//push parameters
sources/System/IAControllable/IAControllableSystem.hpp
+3 -3
View File
@@ -9,7 +9,7 @@
namespace BBM
{
//! @brief A system to handle keyboard entities.
class IAControllableSystem : public WAL::System
class IAControllableSystem : public WAL::System<ControllableComponent, IAControllableComponent>
{
private:
//! @brief extract a number from the lua stack
@@ -18,10 +18,10 @@ namespace BBM
bool getReturnBool(lua_State *state);
public:
//! @inherit
void onFixedUpdate(WAL::Entity &entity) override;
void onFixedUpdate(WAL::ViewEntity<ControllableComponent, IAControllableComponent> &entity) override;
//! @brief A default constructor
IAControllableSystem();
IAControllableSystem(WAL::Wal &wal);
//! @brief A keyboard system is copy constructable
IAControllableSystem(const IAControllableSystem &) = default;
//! @brief A default destructor