equal
deleted
inserted
replaced
193 .collect(), |
193 .collect(), |
194 ) |
194 ) |
195 .send_self(), |
195 .send_self(), |
196 ); |
196 ); |
197 |
197 |
198 for team in room.client_teams(client.id) { |
198 for team in info.client_teams(client.id) { |
199 response.add( |
199 response.add( |
200 ForwardEngineMessage(vec![to_engine_msg(once(b'G').chain(team.name.bytes()))]) |
200 ForwardEngineMessage(vec![to_engine_msg(once(b'G').chain(team.name.bytes()))]) |
201 .send_all() |
201 .send_all() |
202 .in_room(room.id), |
202 .in_room(room.id), |
203 ); |
203 ); |
370 response.add(HedgehogsNumber(team.name.clone(), team.hedgehogs_number).send(to_client)); |
370 response.add(HedgehogsNumber(team.name.clone(), team.hedgehogs_number).send(to_client)); |
371 } |
371 } |
372 } |
372 } |
373 |
373 |
374 pub fn get_room_teams(room: &HwRoom, to_client: ClientId, response: &mut Response) { |
374 pub fn get_room_teams(room: &HwRoom, to_client: ClientId, response: &mut Response) { |
375 get_teams(room.teams.iter().map(|(_, t)| t), to_client, response); |
375 let current_teams = match room.game_info { |
|
376 Some(ref info) => &info.teams_at_start, |
|
377 None => &room.teams, |
|
378 }; |
|
379 |
|
380 get_teams(current_teams.iter().map(|(_, t)| t), to_client, response); |
376 } |
381 } |
377 |
382 |
378 pub fn get_room_flags( |
383 pub fn get_room_flags( |
379 server: &HwServer, |
384 server: &HwServer, |
380 room_id: RoomId, |
385 room_id: RoomId, |