gameServer2/src/server/handlers/inroom.rs
changeset 13500 5359ff75da3a
parent 13494 8c5dd562c9f7
child 13511 d126d9a646ac
--- a/gameServer2/src/server/handlers/inroom.rs	Tue Jul 17 00:27:24 2018 +0300
+++ b/gameServer2/src/server/handlers/inroom.rs	Tue Jul 17 16:03:34 2018 +0300
@@ -35,8 +35,8 @@
     }
 }
 
-fn by_msg(source: &Vec<u8>) -> ByMsg {
-    ByMsg {messages: &source[..]}
+fn by_msg(source: &[u8]) -> ByMsg {
+    ByMsg {messages: source}
 }
 
 const VALID_MESSAGES: &[u8] =
@@ -99,9 +99,10 @@
         Part(Some(msg)) => server.react(client_id, vec![
             MoveToLobby(format!("part: {}", msg))]),
         Chat(msg) => {
+            
             let actions = {
                 let c = &mut server.clients[client_id];
-                let chat_msg = ChatMsg {nick: c.nick.clone(), msg: msg};
+                let chat_msg = ChatMsg {nick: c.nick.clone(), msg};
                 vec![chat_msg.send_all().in_room(room_id).but_self().action()]
             };
             server.react(client_id, actions);
@@ -179,7 +180,7 @@
                 } else if r.is_team_add_restricted() {
                     actions.push(Warn("This room currently does not allow adding new teams.".to_string()));
                 } else {
-                    let team = r.add_team(c.id, info);
+                    let team = r.add_team(c.id, *info);
                     c.teams_in_game += 1;
                     c.clan = Some(team.color);
                     actions.push(TeamAccepted(team.name.clone())