zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-28 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge lobby

Browse Source
This commit is contained in:
Bluub
2021-06-15 16:28:29 +02:00
parent 744ba32b80
commit 35d07117a7
4 changed files with 105 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/System/IAControllable/IAControllableSystem.hpp
+9 -8
View File
@@ -5,13 +5,14 @@
#pragma once
#include <vector>
#include "Component/BombHolder/BombHolderComponent.hpp"
#include "Map/MapInfo.hpp"
#include "System/System.hpp"
namespace BBM
{
//! @brief A system to handle keyboard entities.
class IAControllableSystem : public WAL::System<PositionComponent, ControllableComponent, IAControllableComponent>
class IAControllableSystem : public WAL::System<PositionComponent, ControllableComponent, IAControllableComponent, BombHolderComponent>
{
private:
//! @brief Reference to wal to get Views
@@ -27,16 +28,16 @@ namespace BBM
std::vector<MapInfo> _players;
//! @brief All bombs on the map
std::vector<std::pair<Vector3f, int>> _bombs;
std::vector<std::tuple<Vector3f, int, std::chrono::nanoseconds>> _bombs;
//! @brief update the raw info of the map
void UpdateMapInfos(WAL::ViewEntity<PositionComponent, ControllableComponent, IAControllableComponent> &entity);
void UpdateMapInfos(WAL::ViewEntity<PositionComponent, ControllableComponent, IAControllableComponent, BombHolderComponent> &entity);
//! @brief push danger info position
void pushInfoDangerPos(LuaG::State &state, int &index, float xpos, float ypos);
void pushInfoDangerPos(LuaG::State &state, int &index, float xpos, float ypos, int dangerLevel);
//! @brief push player info
void pushInfoPlayer(LuaG::State &state, MapInfo &player);
void pushInfoPlayer(LuaG::State &state, MapInfo &player, BombHolderComponent &bombHolder);
//! @brief push raw map info
void pushInfoRaw(LuaG::State &state);
@@ -44,12 +45,12 @@ namespace BBM
//! @brief push danger map info
void pushInfoDanger(LuaG::State &state);
//! @brief push all the infos to the ai stack
void pushInfo(LuaG::State &state, MapInfo &player);
//! @brief push all the infos to the lua stack
void pushInfo(LuaG::State &state, MapInfo &player, BombHolderComponent &bombHolder);
public:
//! @inherit
void onFixedUpdate(WAL::ViewEntity<PositionComponent, ControllableComponent, IAControllableComponent> &entity) override;
void onFixedUpdate(WAL::ViewEntity<PositionComponent, ControllableComponent, IAControllableComponent, BombHolderComponent> &entity) override;
//! @inherit
void onSelfUpdate() override;