hedgewars-draft: comparison gameServer2/src/server/handlers/inroom.rs

equal deleted inserted replaced

-:5664650befcd
+:09f4a30e50cc
 use mio;
-use protocol::messages::{
+use crate::{
-HWProtocolMessage,
+server::{
-HWServerMessage::*,
+coretypes::{ClientId, RoomId, Voting, VoteType},
-server_chat
+server::HWServer,
+room::{HWRoom, RoomFlags},
+actions::{Action, Action::*}
+},
+protocol::messages::{
+HWProtocolMessage,
+HWServerMessage::*,
+server_chat
+},
+utils::is_name_illegal
 };
-use server::{
-coretypes::{ClientId, RoomId, Voting, VoteType},
-server::HWServer,
-room::{HWRoom, RoomFlags},
-actions::{Action, Action::*}
-};
-use utils::is_name_illegal;
 use std::{
 mem::swap, fs::{File, OpenOptions},
 io::{Read, Write, Result, Error, ErrorKind}
 };
 use base64::{encode, decode};
 },
 _ => false
 }
 }
-fn is_msg_valid(msg: &[u8], team_indices: &[u8]) -> bool {
+fn is_msg_valid(msg: &[u8], _team_indices: &[u8]) -> bool {
 if let Some(typ) = msg.get(1) {
 VALID_MESSAGES.contains(typ)
 } else {
 false
 }
 VoteType::HedgehogsPerTeam(number) => format!("hedgehogs per team: {}", number)
 })
 }
 fn room_message_flag(msg: &HWProtocolMessage) -> RoomFlags {
-use protocol::messages::HWProtocolMessage::*;
+use crate::protocol::messages::HWProtocolMessage::*;
 match msg {
 ToggleRestrictJoin => RoomFlags::RESTRICTED_JOIN,
 ToggleRestrictTeams => RoomFlags::RESTRICTED_TEAM_ADD,
 ToggleRegisteredOnly => RoomFlags::RESTRICTED_UNREGISTERED_PLAYERS,
 _ => RoomFlags::empty()
 let mut writer = OpenOptions::new().create(true).write(true).open(filename)?;
 writer.write_all(content.as_bytes())
 }
 pub fn handle(server: &mut HWServer, client_id: ClientId, room_id: RoomId, message: HWProtocolMessage) {
-use protocol::messages::HWProtocolMessage::*;
+use crate::protocol::messages::HWProtocolMessage::*;
 match message {
 Part(None) => server.react(client_id, vec![
 MoveToLobby("part".to_string())]),
 Part(Some(msg)) => server.react(client_id, vec![
 MoveToLobby(format!("part: {}", msg))]),
 vec![SendRoomUpdate(Some(old_name))]
 };
 server.react(client_id, actions);
 },
 ToggleReady => {
-let actions = if let (c, Some(r)) = server.client_and_room(client_id) {
+if let (c, Some(r)) = server.client_and_room(client_id) {
 let flags = if c.is_ready() {
 r.ready_players_number -= 1;
 "-r"
 } else {
 r.ready_players_number += 1;
 "+r"
 };
-let is_ready = !c.is_ready();
+c.set_is_ready(!c.is_ready());
-c.set_is_ready(is_ready);
 let mut v =
 vec![ClientFlags(flags.to_string(), vec![c.nick.clone()])
 .send_all().in_room(r.id).action()];
 if r.is_fixed() && r.ready_players_number == r.players_number {
 v.push(StartRoomGame(r.id))
 }
-v
+server.react(client_id, v);
-} else {
+}
-Vec::new()
-};
-server.react(client_id, actions);
 }
 AddTeam(info) => {
 let mut actions = Vec::new();
 if let (c, Some(r)) = server.client_and_room(client_id) {
 if r.teams.len() >= r.team_limit as usize {
 }
 };
 server.react(client_id, actions);
 },
 SetHedgehogsNumber(team_name, number) => {
-let actions = if let (c, Some(r)) = server.client_and_room(client_id) {
+if let (c, Some(r)) = server.client_and_room(client_id) {
 let addable_hedgehogs = r.addable_hedgehogs();
-if let Some((_, mut team)) = r.find_team_and_owner_mut(|t| t.name == team_name) {
+let actions = if let Some((_, team)) = r.find_team_and_owner_mut(|t| t.name == team_name) {
 if !c.is_master() {
 vec![ProtocolError("You're not the room master!".to_string())]
 } else if number < 1 || number > 8
 || number > addable_hedgehogs + team.hedgehogs_number {
 vec![HedgehogsNumber(team.name.clone(), team.hedgehogs_number)
 vec![HedgehogsNumber(team.name.clone(), number)
 .send_all().in_room(room_id).but_self().action()]
 }
 } else {
 vec![(Warn("No such team.".to_string()))]
-}
+};
-} else {
+server.react(client_id, actions);
-Vec::new()
+}
-};
-server.react(client_id, actions);
 },
 SetTeamColor(team_name, color) => {
-let mut owner_id = None;
+if let (c, Some(r)) = server.client_and_room(client_id) {
-let actions = if let (c, Some(r)) = server.client_and_room(client_id) {
+let mut owner_id = None;
-if let Some((owner, mut team)) = r.find_team_and_owner_mut(|t| t.name == team_name) {
+let actions = if let Some((owner, team)) = r.find_team_and_owner_mut(|t| t.name == team_name) {
 if !c.is_master() {
 vec![ProtocolError("You're not the room master!".to_string())]
 } else if false  {
 Vec::new()
 } else {
 vec![TeamColor(team.name.clone(), color)
 .send_all().in_room(room_id).but_self().action()]
 }
 } else {
 vec![(Warn("No such team.".to_string()))]
-}
+};
-} else {
-Vec::new()
+if let Some(id) = owner_id {
-};
+server.clients[id].clan = Some(color);
+}
-if let Some(id) = owner_id {
-server.clients[id].clan = Some(color);
+server.react(client_id, actions);
-}
+};
-server.react(client_id, actions);
 },
 Cfg(cfg) => {
-let actions = if let (c, Some(r)) = server.client_and_room(client_id) {
+if let (c, Some(r)) = server.client_and_room(client_id) {
-if r.is_fixed() {
+let actions = if r.is_fixed() {
 vec![Warn("Access denied.".to_string())]
 } else if !c.is_master() {
 vec![ProtocolError("You're not the room master!".to_string())]
 } else {
 let v = vec![cfg.to_server_msg()
 .send_all().in_room(r.id).but_self().action()];
 r.set_config(cfg);
 v
-}
+};
-} else {
+server.react(client_id, actions);
-Vec::new()
+}
-};
-server.react(client_id, actions);
 }
 Save(name, location) => {
 let actions = vec![server_chat(format!("Room config saved as {}", name))
 .send_all().in_room(room_id).action()];
 server.rooms[room_id].save_config(name, location);
 server.react(client_id, actions);
 }
 SaveRoom(filename) => {
-let actions = if server.clients[client_id].is_admin() {
+if server.clients[client_id].is_admin() {
-match server.rooms[room_id].get_saves() {
+let actions = match server.rooms[room_id].get_saves() {
 Ok(text) => match write_file(&filename, &text) {
 Ok(_) => vec![server_chat("Room configs saved successfully.".to_string())
 .send_self().action()],
 Err(e) => {
 warn!("Error while writing the config file \"{}\": {}", filename, e);
 }
 Err(e) => {
 warn!("Error while serializing the room configs: {}", e);
 vec![Warn("Unable to serialize the room configs.".to_string())]
 }
-}
+};
-} else {
+server.react(client_id, actions);
-Vec::new()
+}
-};
-server.react(client_id, actions);
 }
 LoadRoom(filename) => {
-let actions = if server.clients[client_id].is_admin() {
+if server.clients[client_id].is_admin() {
-match read_file(&filename) {
+let actions = match read_file(&filename) {
 Ok(text) => match server.rooms[room_id].set_saves(&text) {
 Ok(_) => vec![server_chat("Room configs loaded successfully.".to_string())
 .send_self().action()],
 Err(e) => {
 warn!("Error while deserializing the room configs: {}", e);
 }
 Err(e) => {
 warn!("Error while reading the config file \"{}\": {}", filename, e);
 vec![Warn("Unable to load the room configs.".to_string())]
 }
-}
+};
-} else {
+server.react(client_id, actions);
-Vec::new()
+}
-};
-server.react(client_id, actions);
 }
 Delete(name) => {
 let actions = if !server.rooms[room_id].delete_config(&name) {
 vec![Warn(format!("Save doesn't exist: {}", name))]
 } else {

changeset 13666	09f4a30e50cc
parent 13530	80db7232b4b5
child 13709	e335daaa77a9