hedgewars: comparison gameServer2/src/server/actions.rs

equal deleted inserted replaced

-:c85b324c4c2d
+:1ee192f13456
 iter::once,
 mem::replace
 };
 use super::{
 server::HWServer,
-room::{GameInfo},
+room::GameInfo,
 client::HWClient,
 coretypes::{ClientId, RoomId, GameCfg, VoteType},
 room::HWRoom,
 handlers
 };
 pub enum Destination {
 ToId(ClientId),
 ToSelf,
 ToAll {
 room_id: Option<RoomId>,
-protocol: Option<u32>,
+protocol: Option<u16>,
 skip_self: bool
 }
 }
 pub struct PendingMessage {
 *room_id = Some(clients_room_id)
 }
 self
 }
-pub fn with_protocol(mut self, protocol_number: u32) -> PendingMessage {
+pub fn with_protocol(mut self, protocol_number: u16) -> PendingMessage {
 if let Destination::ToAll {ref mut protocol, ..} = self.destination {
 *protocol = Some(protocol_number)
 }
 self
 }
 let actions = {
 let r = &mut server.rooms[room_id];
 let c = &mut server.clients[client_id];
 r.players_number += 1;
 c.room_id = Some(room_id);
-c.is_joined_mid_game = false;
-if r.master_id == Some(c.id) {
+let is_master = r.master_id == Some(c.id);
+c.set_is_master(is_master);
+c.set_is_ready(is_master);
+c.set_is_joined_mid_game(false);
+if is_master {
 r.ready_players_number += 1;
-c.is_master = true;
-c.is_ready = true;
-} else {
-c.is_ready = false;
-c.is_master = false;
 }
 let mut v = vec![
 RoomJoined(vec![c.nick.clone()]).send_all().in_room(room_id).action(),
 ClientFlags("+i".to_string(), vec![c.nick.clone()]).send_all().action(),
 SendRoomUpdate(None)];
 if !r.greeting.is_empty() {
 v.push(ChatMsg {nick: "[greeting]".to_string(), msg: r.greeting.clone()}
 .send_self().action());
 }
-if !c.is_master {
+if !c.is_master() {
 let team_names: Vec<_>;
 if let Some(ref mut info) = r.game_info {
-c.is_in_game = true;
+c.set_is_in_game(true);
-c.is_joined_mid_game = true;
+c.set_is_joined_mid_game(true);
 {
 let teams = info.client_teams(c.id);
 c.teams_in_game = teams.clone().count() as u8;
 c.clan = teams.clone().next().map(|t| t.color);
 if let Some(id) = r.master_id {
 actions.push(ClientFlags("+h".to_string(), vec![server.clients[id].nick.clone()])
 .send(to).action());
 }
 let nicks: Vec<_> = server.clients.iter()
-.filter(|(_, c)| c.room_id == Some(r.id) && c.is_ready)
+.filter(|(_, c)| c.room_id == Some(r.id) && c.is_ready())
 .map(|(_, c)| c.nick.clone()).collect();
 if !nicks.is_empty() {
 actions.push(ClientFlags("+r".to_string(), nicks)
 .send(to).action());
 }
 MoveToLobby(msg) => {
 let mut actions = Vec::new();
 let lobby_id = server.lobby_id;
 if let (c, Some(r)) = server.client_and_room(client_id) {
 r.players_number -= 1;
-if c.is_ready && r.ready_players_number > 0 {
+if c.is_ready() && r.ready_players_number > 0 {
 r.ready_players_number -= 1;
 }
-if c.is_master && (r.players_number > 0 || r.is_fixed) {
+if c.is_master() && (r.players_number > 0 || r.is_fixed) {
 actions.push(ChangeMaster(r.id, None));
 }
 actions.push(ClientFlags("-i".to_string(), vec![c.nick.clone()])
 .send_all().action());
 }
 let new_nick = new_id.map(|id| server.clients[id].nick.clone());
 if let (c, Some(r)) = server.client_and_room(client_id) {
 match r.master_id {
 Some(id) if id == c.id => {
-c.is_master = false;
+c.set_is_master(false);
 r.master_id = None;
 actions.push(ClientFlags("-h".to_string(), vec![c.nick.clone()])
 .send_all().in_room(r.id).action());
 }
 Some(_) => unreachable!(),
 if let Some(nick) = new_nick {
 actions.push(ClientFlags("+h".to_string(), vec![nick])
 .send_all().in_room(r.id).action());
 }
 }
-new_id.map(|id| server.clients[id].is_master = true);
+new_id.map(|id| server.clients[id].set_is_master(true));
 server.react(client_id, actions);
 }
 RemoveTeam(name) => {
 let mut actions = Vec::new();
 if let (c, Some(r)) = server.client_and_room(client_id) {
 if let Some(ref mut info) = r.game_info {
 info.left_teams.push(name.clone());
 }
 actions.push(TeamRemove(name.clone()).send_all().in_room(r.id).action());
 actions.push(SendRoomUpdate(None));
-if r.game_info.is_some() && c.is_in_game {
+if r.game_info.is_some() && c.is_in_game() {
 actions.push(SendTeamRemovalMessage(name));
 }
 }
 server.react(client_id, actions);
 },
 vec![Warn("The game is already in progress".to_string())]
 } else {
 room.start_round();
 for id in room_clients {
 let c = &mut server.clients[id];
-c.is_in_game = true;
+c.set_is_in_game(false);
 c.team_indices = room.client_team_indices(c.id);
 }
 vec![RunGame.send_all().in_room(room.id).action(),
 SendRoomUpdate(None),
 ClientFlags("+g".to_string(), room_nicks)
 actions.push(RoundFinished.send_all().in_room(r.id).action());
 }
 if let Some(info) = old_info {
 for (_, c) in server.clients.iter() {
-if c.room_id == Some(room_id) && c.is_joined_mid_game {
+if c.room_id == Some(room_id) && c.is_joined_mid_game() {
 actions.push(SendRoomData{
 to: c.id, teams: false,
 config: true, flags: false});
 for name in info.left_teams.iter() {
 actions.push(TeamRemove(name.clone())
 }
 let nicks: Vec<_> = server.clients.iter_mut()
 .filter(|(_, c)| c.room_id == Some(room_id))
 .map(|(_, c)| {
-c.is_ready = c.is_master;
+let is_master = c.is_master();
-c.is_joined_mid_game = false;
+c.set_is_ready(is_master);
+c.set_is_joined_mid_game(false);
 c
-}).filter_map(|c| if !c.is_master {
+}).filter_map(|c| if !c.is_master() {
 Some(c.nick.clone())
 } else {
 None
 }).collect();
 if !nicks.is_empty() {

changeset 13520	1ee192f13456
parent 13480	fb37745c5bca
child 13523	8c5dd562c9f7