From 3ac4fd6d1b07854444def879c8f5c0a5fbbad734 Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 1 May 2019 01:09:48 +1000 Subject: [PATCH] little fixes --- client/src/components/info.component.jsx | 1 + server/src/game.rs | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx index 6919ed49..dce4ec63 100644 --- a/client/src/components/info.component.jsx +++ b/client/src/components/info.component.jsx @@ -167,6 +167,7 @@ function Info(args) { } if (round.finished) return 'finished'; + if (round.game_id) return 'in game'; return player.ready ? 'ready' diff --git a/server/src/game.rs b/server/src/game.rs index 93e73327..934f8851 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -90,7 +90,7 @@ impl Game { } let player_description = player.cryps.iter().map(|c| c.name.clone()).collect::>().join(", "); - self.log.push(format!("{:} has joined the game. [{:?}]", player.name, player_description)); + self.log.push(format!("{:} has joined the game. [{:}]", player.name, player_description)); self.players.push(player); @@ -570,7 +570,7 @@ impl Game { return self; } - println!("upkeep beginning: {:?} vs {:?}", self.players[0].name, self.players[1].name); + println!("upkeep beginning: {:} vs {:}", self.players[0].name, self.players[1].name); if !self.phase_timed_out() { return self; @@ -580,11 +580,11 @@ impl Game { if !player.ready { player.set_ready(true); player.add_warning(); - println!("upkeep: {:?} warned", player.name); + println!("upkeep: {:} warned", player.name); if player.warnings >= 3 { player.forfeit(); - println!("upkeep: {:?} forfeited", player.name); - self.log.push(format!("{:?} forfeited.", player.name)); + println!("upkeep: {:} forfeited", player.name); + self.log.push(format!("{:} forfeited.", player.name)); } } }