From 8ef39624513f6d545f8a0828f5b22fc372a18214 Mon Sep 17 00:00:00 2001 From: Kieran Kihn <114803508+kierankihn@users.noreply.github.com> Date: Mon, 17 Nov 2025 13:58:13 +0800 Subject: [PATCH] refractor(game): simplify `nextPlayer` logic in `GameState` --- src/game/GameState.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/game/GameState.h b/src/game/GameState.h index 5ca1291..394721a 100644 --- a/src/game/GameState.h +++ b/src/game/GameState.h @@ -204,18 +204,16 @@ namespace UNO::GAME { void GameState::nextPlayer() { if (this->isReversed_ == false) { + this->currentPlayer_ = std::next(this->currentPlayer_); if (this->currentPlayer_ == this->players_.end()) { - this->currentPlayer_ = std::next(this->currentPlayer_); this->currentPlayer_ = this->players_.begin(); } } else { if (this->currentPlayer_ == this->players_.begin()) { - this->currentPlayer_ = std::prev(this->players_.end()); - } - else { - this->currentPlayer_ = std::prev(this->currentPlayer_); + this->currentPlayer_ = this->players_.end(); } + this->currentPlayer_ = std::prev(this->currentPlayer_); } }