rust/hedgewars-server/src/handlers/inroom.rs
changeset 15562 479911540e17
parent 15558 a798e6441a36
child 15563 d122b65bdf6f
equal deleted inserted replaced
15561:d8326878e933 15562:479911540e17
   257                         client.is_in_game(),
   257                         client.is_in_game(),
   258                         removed_teams,
   258                         removed_teams,
   259                         response,
   259                         response,
   260                     );
   260                     );
   261 
   261 
   262                     if let Some(0) = room.teams_in_game() {
   262                     match room.game_info {
   263                         if let Some(result) = room_control.end_game() {
   263                         Some(ref info) if info.teams_in_game == 0 => {
   264                             super::common::get_end_game_result(
   264                             if let Some(result) = room_control.end_game() {
   265                                 room_control.server(),
   265                                 super::common::get_end_game_result(
   266                                 room_id,
   266                                     room_control.server(),
   267                                 result,
   267                                     room_id,
   268                                 response,
   268                                     result,
   269                             );
   269                                     response,
       
   270                                 );
       
   271                             }
   270                         }
   272                         }
       
   273                         _ => (),
   271                     }
   274                     }
   272                 }
   275                 }
   273                 Err(RemoveTeamError::NoTeam) => response.warn(NO_TEAM_TO_REMOVE),
   276                 Err(RemoveTeamError::NoTeam) => response.warn(NO_TEAM_TO_REMOVE),
   274                 Err(RemoveTeamError::TeamNotOwned) => response.warn(TEAM_NOT_OWNED),
   277                 Err(RemoveTeamError::TeamNotOwned) => response.warn(TEAM_NOT_OWNED),
   275             }
   278             }
   456                             .in_room(room_id)
   459                             .in_room(room_id)
   457                             .but_self(),
   460                             .but_self(),
   458                     );
   461                     );
   459                 }
   462                 }
   460 
   463 
   461                 if let Some(0) = room.teams_in_game() {
   464                 if let Some(GameInfo {
       
   465                     teams_in_game: 0, ..
       
   466                 }) = room.game_info
       
   467                 {
   462                     if let Some(result) = room_control.end_game() {
   468                     if let Some(result) = room_control.end_game() {
   463                         super::common::get_end_game_result(
   469                         super::common::get_end_game_result(
   464                             room_control.server(),
   470                             room_control.server(),
   465                             room_id,
   471                             room_id,
   466                             result,
   472                             result,