kierankihn/uno-game
1
0
Fork 0
mirror of https://github.com/kierankihn/uno-game.git synced 2025-12-27 02:13:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(game): simplify card play logic

Browse Source 
- Replaced iterator-based `play` methods with a single card-based method.
- Streamlined logic in `ServerPlayerState`, `ClientGameState`, and `HandCard`.
This commit is contained in:
Kieran Kihn
2025-12-07 13:57:54 +08:00
parent ea87fca1fd
commit 5196de460a
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/game/GameState.cpp
View File

@@ -56,11 +56,6 @@ namespace UNO::GAME {
PlayerState::draw(n, cards);
}
Card ClientPlayerState::play(const Card &card)
{
return PlayerState::play(card);
}
ServerPlayerState::ServerPlayerState(std::string name, size_t remainingCardCount, bool isUno) :
PlayerState(std::move(name), remainingCardCount, isUno)
{
@@ -80,16 +75,7 @@ namespace UNO::GAME {
Card ServerPlayerState::play(const Card &card)
{
for (auto it = this->handCard_.getCards().begin();; it++) {
if (it == this->handCard_.getCards().end()) {
throw std::invalid_argument("Card not found in hand");
}
if (card.getType() == it->getType()
&& (card.getType() == CardType::WILD || card.getType() == CardType::WILDDRAWFOUR || card.getColor() == it->getColor())) {
this->handCard_.play(it);
break;
}
}
this->handCard_.play(card);
return PlayerState::play(card);
}
@@ -121,9 +107,9 @@ namespace UNO::GAME {
this->player_.draw(cards);
}
Card ClientGameState::play(const std::multiset<Card>::iterator &it)
void ClientGameState::play(const Card &card)
{
return this->player_.play(it);
this->player_.play(card);
}
bool ClientGameState::isEmpty() const