Kelder/planet-wars
28
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't waste peoples time

Browse source
This commit is contained in:
ajuvercr 2019-09-14 20:16:20 +02:00
parent 0e9e36c0c8
commit fc6bcca0f8
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
backend/src/planetwars/mod.rs
View file

@ -21,11 +21,11 @@ pub struct PlanetWarsGame {
impl PlanetWarsGame { impl PlanetWarsGame {
fn dispatch_state(&self, updates: &mut Vec<game::Update>, ) { fn dispatch_state(&self, were_alive: Vec<usize>, updates: &mut Vec<game::Update>, ) {
let state = pw_serializer::serialize(&self.state); let state = pw_serializer::serialize(&self.state);
println!("{}", serde_json::to_string(&state).unwrap()); println!("{}", serde_json::to_string(&state).unwrap());
for player in self.state.players.iter() { for player in self.state.players.iter().filter(|p| were_alive.contains(&p.id)) {
let state = pw_serializer::serialize_rotated(&self.state, player.id); let state = pw_serializer::serialize_rotated(&self.state, player.id);
let state = if player.alive { let state = if player.alive {
proto::ServerMessage::GameState(state) proto::ServerMessage::GameState(state)
@ -36,6 +36,10 @@ impl PlanetWarsGame {
updates.push( updates.push(
game::Update::Player((player.id as u64).into(), serde_json::to_vec(&state).unwrap()) game::Update::Player((player.id as u64).into(), serde_json::to_vec(&state).unwrap())
); );
if !player.alive {
updates.push(game::Update::Kick((player.id as u64).into()));
}
} }
} }
@ -113,11 +117,13 @@ impl game::GameController for PlanetWarsGame {
fn step<'a>(&mut self, turns: Vec<game::PlayerTurn<'a>>) -> Vec<game::Update> { fn step<'a>(&mut self, turns: Vec<game::PlayerTurn<'a>>) -> Vec<game::Update> {
let mut updates = Vec::new(); let mut updates = Vec::new();
let alive = self.state.living_players();
self.state.repopulate(); self.state.repopulate();
self.execute_commands(turns, &mut updates); self.execute_commands(turns, &mut updates);
self.state.step(); self.state.step();
self.dispatch_state(&mut updates); self.dispatch_state(alive, &mut updates);
updates updates
} }