From fd8ba0d9c7317f24e0b655c6b15ca197d5a23daa Mon Sep 17 00:00:00 2001 From: salmonik Date: Mon, 24 Aug 2026 18:11:08 +0200 Subject: Fix second-game InvalidAction: reset phase after spin, allow re-spin in Finished state --- src/bin/client/games/manager.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/bin/client/games/manager.rs') diff --git a/src/bin/client/games/manager.rs b/src/bin/client/games/manager.rs index 6959214..0b5b4cb 100644 --- a/src/bin/client/games/manager.rs +++ b/src/bin/client/games/manager.rs @@ -55,7 +55,7 @@ impl GameManager { ) -> Result<(), GameError> { let game_type = self .pending_game_type - .take() + .as_ref() .ok_or(GameError::InvalidAction)?; let state = self @@ -63,7 +63,7 @@ impl GameManager { .as_mut() .ok_or(GameError::InvalidAction)?; - if state.phase != GamePhase::WaitingToStart { + if state.phase != GamePhase::WaitingToStart && state.phase != GamePhase::Finished { return Err(GameError::InvalidAction); } @@ -103,6 +103,13 @@ impl GameManager { .unwrap_or(false) } + pub fn reset_phase_to_waiting(&mut self) { + if let Some(ref mut session) = self.current_session { + session.phase = GamePhase::WaitingToStart; + session.data.clear(); + } + } + pub fn end_game(&mut self) { self.current_session = None; self.pending_game_type = None; -- cgit v1.2.3