equal
deleted
inserted
replaced
412 } |
412 } |
413 StartGame => { |
413 StartGame => { |
414 let result = room_control.start_game(); |
414 let result = room_control.start_game(); |
415 super::common::get_start_game_data(room_control.server(), room_id, result, response); |
415 super::common::get_start_game_data(room_control.server(), room_id, result, response); |
416 } |
416 } |
417 /*EngineMessage(em) => { |
417 EngineMessage(em) => { |
418 if client.teams_in_game > 0 { |
418 if client.teams_in_game > 0 { |
419 let decoding = decode(&em[..]).unwrap(); |
419 let decoding = decode(&em[..]).unwrap(); |
420 let messages = by_msg(&decoding); |
420 let messages = by_msg(&decoding); |
421 let valid = messages.filter(|m| is_msg_valid(m, &client.team_indices)); |
421 let valid = messages.filter(|m| is_msg_valid(m, &client.team_indices)); |
422 let non_empty = valid.clone().filter(|m| !is_msg_empty(m)); |
422 let non_empty = valid.clone().filter(|m| !is_msg_empty(m)); |
436 .in_room(room.id) |
436 .in_room(room.id) |
437 .but_self(), |
437 .but_self(), |
438 ); |
438 ); |
439 } |
439 } |
440 let em_log = encode(&non_empty.flat_map(|msg| msg).cloned().collect::<Vec<_>>()); |
440 let em_log = encode(&non_empty.flat_map(|msg| msg).cloned().collect::<Vec<_>>()); |
441 if let Some(ref mut info) = room.game_info { |
441 |
442 if !em_log.is_empty() { |
442 room_control.log_engine_msg(em_log, sync_msg); |
443 info.msg_log.push(em_log); |
443 } |
444 } |
444 } |
445 if let Some(msg) = sync_msg { |
|
446 info.sync_msg = msg; |
|
447 } |
|
448 } |
|
449 } |
|
450 }*/ |
|
451 RoundFinished => { |
445 RoundFinished => { |
452 if let Some(team_names) = room_control.leave_game() { |
446 if let Some(team_names) = room_control.leave_game() { |
453 let (client, room) = room_control.get(); |
447 let (client, room) = room_control.get(); |
454 response.add( |
448 response.add( |
455 ClientFlags(remove_flags(&[Flags::InGame]), vec![client.nick.clone()]) |
449 ClientFlags(remove_flags(&[Flags::InGame]), vec![client.nick.clone()]) |