# HG changeset patch # User unc0rr # Date 1486392867 -10800 # Node ID 8591375271b86a87a261bb442040d0200a8002a0 # Parent 03ccb89820f3b23d0dcb31e6e5711f0d100e2139 Store room protocol number diff -r 03ccb89820f3 -r 8591375271b8 gameServer2/src/server/actions.rs --- a/gameServer2/src/server/actions.rs Sat Feb 04 19:52:38 2017 +0300 +++ b/gameServer2/src/server/actions.rs Mon Feb 06 17:54:27 2017 +0300 @@ -72,12 +72,17 @@ }, AddRoom(name, password) => { let room_id = server.rooms.insert(HWRoom::new()).ok().expect("Cannot add room"); - let r = &mut server.rooms[room_id]; - r.name = name; - r.password = password; - r.id = room_id.clone(); - r.ready_players_number = 1; - server.clients[token].room_id = Some(room_id); + { + let r = &mut server.rooms[room_id]; + let c = &mut server.clients[token]; + r.name = name; + r.password = password; + r.id = room_id.clone(); + r.ready_players_number = 1; + r.protocol_number = c.protocol_number; + c.room_id = Some(room_id); + } + }, Warn(msg) => { run_action(server, token, poll, SendMe(Warning(&msg).to_raw_protocol())); diff -r 03ccb89820f3 -r 8591375271b8 gameServer2/src/server/server.rs --- a/gameServer2/src/server/server.rs Sat Feb 04 19:52:38 2017 +0300 +++ b/gameServer2/src/server/server.rs Mon Feb 06 17:54:27 2017 +0300 @@ -94,6 +94,7 @@ pub id: Token, pub name: String, pub password: Option, + pub protocol_number: u32, pub ready_players_number: u8, } @@ -103,6 +104,7 @@ id: Token(0), name: String::new(), password: None, + protocol_number: 0, ready_players_number: 0, } }