From bd1ab15599e51c8e53272cc40c2110f4b3ff8b53 Mon Sep 17 00:00:00 2001 From: ThePerkinrex Date: Wed, 14 Jul 2021 13:47:51 +0200 Subject: [PATCH] Add send status on game start --- server/src/server/game.rs | 2 +- server/src/server/lobby.rs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/src/server/game.rs b/server/src/server/game.rs index d201cb2..fdb9771 100644 --- a/server/src/server/game.rs +++ b/server/src/server/game.rs @@ -5,7 +5,7 @@ use crate::{ }; use anyhow::{anyhow, Result}; -async fn get_status(data: &mut ServiceData) -> Result { +pub(super) async fn get_status(data: &mut ServiceData) -> Result { let uuid = data .user_id.get()?; log::info!("Creating a new status for {}", uuid); diff --git a/server/src/server/lobby.rs b/server/src/server/lobby.rs index 20300cb..8884d59 100644 --- a/server/src/server/lobby.rs +++ b/server/src/server/lobby.rs @@ -61,11 +61,15 @@ pub(super) async fn ready(data: &mut ServiceData, socket_mgr: &SocketManager) -> log::info!("[{}] Started a game ({})", lobby, winner); } let status = get_status(data).await?; + let is_starting = status.is_starting; socket_mgr .broadcast_to_lobby(&mut data.db, data.user_id.get()?, Data::LobbyStatus(status)) .await?; log::info!("Player {} is ready", uuid); - + if is_starting { + let game_status = super::game::get_status(data).await?; + socket_mgr.broadcast_to_lobby(&mut data.db, data.user_id.get()?, Data::GameStatus(game_status)).await?; + } Ok(()) }