equal
deleted
inserted
replaced
388 } else { |
388 } else { |
389 Some("/callvote kick: No such user!".to_string()) |
389 Some("/callvote kick: No such user!".to_string()) |
390 } |
390 } |
391 } |
391 } |
392 VoteType::Map(None) => { |
392 VoteType::Map(None) => { |
393 let names: Vec<_> = server.rooms[room_id].saves.keys().cloned().collect(); |
393 let names: Vec<_> = server.room(room_id).saves.keys().cloned().collect(); |
394 if names.is_empty() { |
394 if names.is_empty() { |
395 Some("/callvote map: No maps saved in this room!".to_string()) |
395 Some("/callvote map: No maps saved in this room!".to_string()) |
396 } else { |
396 } else { |
397 Some(format!("Available maps: {}", names.join(", "))) |
397 Some(format!("Available maps: {}", names.join(", "))) |
398 } |
398 } |
420 |
420 |
421 match error { |
421 match error { |
422 None => { |
422 None => { |
423 let msg = voting_description(&kind); |
423 let msg = voting_description(&kind); |
424 let voting = Voting::new(kind, server.room_clients(client_id).collect()); |
424 let voting = Voting::new(kind, server.room_clients(client_id).collect()); |
425 let room = &mut server.rooms[room_id]; |
425 let room = server.room_mut(room_id); |
426 room.voting = Some(voting); |
426 room.voting = Some(voting); |
427 response.add(server_chat(msg).send_all().in_room(room_id)); |
427 response.add(server_chat(msg).send_all().in_room(room_id)); |
428 super::common::submit_vote( |
428 super::common::submit_vote( |
429 server, |
429 server, |
430 types::Vote { |
430 types::Vote { |