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

fixed some warning + one test

Browse Source
This commit is contained in:
HENRY Benjamin
2021-06-18 16:25:38 +02:00
parent 74f85373ac
commit 3c0d933b83
5 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Component/Lobby/ResumeLobbyComponent.cpp
+3 -3
View File
@@ -6,16 +6,16 @@
namespace BBM
{
ResumeLobbyComponent::ResumeLobbyComponent(WAL::Entity &entity, int playerNumber, WAL::Entity &button, WAL::Entity &tile, int color)
ResumeLobbyComponent::ResumeLobbyComponent(WAL::Entity &entity, int playerNumber, WAL::Entity &button, WAL::Entity &tile, int pColor)
: WAL::Component(entity),
playerID(playerNumber),
readyButton(button),
coloredTile(tile),
color(color)
playerColor(pColor)
{}
WAL::Component *ResumeLobbyComponent::clone(WAL::Entity &entity) const
{
return new ResumeLobbyComponent(entity, this->playerID, this->readyButton, this->coloredTile, this->color);
return new ResumeLobbyComponent(entity, this->playerID, this->readyButton, this->coloredTile, this->playerColor);
}
}
sources/Component/Lobby/ResumeLobbyComponent.hpp
+2 -2
View File
@@ -20,7 +20,7 @@ namespace BBM
//! @brief The ID of the lobby player (from 0 to 3)
int playerID;
//! @brief The color of the player (as an index)
int color;
int playerColor;
//! @brief Is this player ready
bool ready = false;
//! @brief The entity containing the ready display.
@@ -33,7 +33,7 @@ namespace BBM
Component *clone(WAL::Entity &entity) const override;
//! @brief Create a new lobby component.
explicit ResumeLobbyComponent(WAL::Entity &entity, int playerNumber, WAL::Entity &button, WAL::Entity &tile, int color);
explicit ResumeLobbyComponent(WAL::Entity &entity, int playerNumber, WAL::Entity &button, WAL::Entity &tile, int pColor);
//! @brief A lobby component is copyable.
ResumeLobbyComponent(const ResumeLobbyComponent &) = default;
//! @brief A default destructor