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): return drawn cards in updateStateByDraw

Browse Source 
- Updated `updateStateByDraw` to return a `std::vector<Card>` instead of `void`.
- Adjusted `ServerGameState`, `GameState`, and `ClientGameState` implementations to reflect the change.
This commit is contained in:
Kieran Kihn
2025-12-02 12:06:06 +08:00
parent e5304b8c6c
commit 8a00b66047
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/GameState.cpp
View File

@@ -146,13 +146,15 @@ namespace UNO::GAME {
} }
} }
void ServerGameState::updateStateByDraw() std::vector<Card> ServerGameState::updateStateByDraw()
{ {
if (this->drawCount_ == 0) { if (this->drawCount_ == 0) {
this->drawCount_ = 1; this->drawCount_ = 1;
} }
this->currentPlayer_->draw(this->drawCount_, deck_.draw(this->drawCount_)); auto cards = deck_.draw(this->drawCount_);
this->currentPlayer_->draw(this->drawCount_, cards);
this->drawCount_ = 0; this->drawCount_ = 0;
this->nextPlayer(); this->nextPlayer();
return cards;
} }
} // namespace UNO::GAME } // namespace UNO::GAME

9
src/game/GameState.h
View File

@@ -193,7 +193,7 @@ namespace UNO::GAME {
/** /**
* 由于用户摸牌而改变状态 * 由于用户摸牌而改变状态
*/ */
void virtual updateStateByDraw(); std::vector<Card> virtual updateStateByDraw();
}; };
template<PlayerStateTypeConcept PlayerStateType> template<PlayerStateTypeConcept PlayerStateType>
@@ -294,7 +294,7 @@ namespace UNO::GAME {
} }
template<PlayerStateTypeConcept PlayerStateType> template<PlayerStateTypeConcept PlayerStateType>
void GameState<PlayerStateType>::updateStateByDraw() std::vector<Card> GameState<PlayerStateType>::updateStateByDraw()
{ {
if (this->drawCount_ == 0) { if (this->drawCount_ == 0) {
this->drawCount_ = 1; this->drawCount_ = 1;
@@ -302,6 +302,7 @@ namespace UNO::GAME {
this->currentPlayer_->draw(this->drawCount_, {}); this->currentPlayer_->draw(this->drawCount_, {});
this->drawCount_ = 0; this->drawCount_ = 0;
this->nextPlayer(); this->nextPlayer();
return {};
} }
class ClientGameState final : public GameState<ClientPlayerState> { class ClientGameState final : public GameState<ClientPlayerState> {
@@ -309,7 +310,7 @@ namespace UNO::GAME {
Player player_; Player player_;
public: public:
ClientGameState(std::string name); explicit ClientGameState(std::string name);
/** /**
* 获得当前手牌 * 获得当前手牌
@@ -357,7 +358,7 @@ namespace UNO::GAME {
/** /**
* 由于用户摸牌而改变状态 * 由于用户摸牌而改变状态
*/ */
void updateStateByDraw() override; std::vector<Card> updateStateByDraw() override;
}; };
} // namespace UNO::GAME } // namespace UNO::GAME