diff -r 7e874846afe3 -r 589a2d7d3dc5 gameServer2/src/server/client.rs --- a/gameServer2/src/server/client.rs Tue Jan 24 20:28:16 2017 +0300 +++ b/gameServer2/src/server/client.rs Wed Jan 25 23:48:23 2017 +0300 @@ -7,15 +7,17 @@ use utils; use protocol::ProtocolDecoder; use protocol::messages::*; -use server::actions::Action::*; -use server::actions::Action; +use super::actions::Action::*; +use super::actions::Action; pub struct HWClient { sock: TcpStream, decoder: ProtocolDecoder, buf_out: netbuf::Buf, + room_id: Token, + pub nick: String, - room_id: Token, + pub protocolNumber: u32, } impl HWClient { @@ -24,8 +26,10 @@ sock: sock, decoder: ProtocolDecoder::new(), buf_out: netbuf::Buf::new(), + room_id: roomId.clone(), + nick: String::new(), - room_id: roomId.clone(), + protocolNumber: 0, } }