restore setup sending on room join
authoralfadur
Sat, 13 Apr 2019 00:08:04 +0300
changeset 14804 e41131607167
parent 14803 d11481978633
child 14805 2107fd023733
restore setup sending on room join
rust/hedgewars-server/src/server/handlers/common.rs
--- a/rust/hedgewars-server/src/server/handlers/common.rs	Fri Apr 12 23:40:32 2019 +0300
+++ b/rust/hedgewars-server/src/server/handlers/common.rs	Sat Apr 13 00:08:04 2019 +0300
@@ -239,7 +239,23 @@
     let nicks = server.collect_nicks(|(_, c)| c.room_id == Some(room_id));
     response.add(RoomJoined(nicks).send_self());
 
+    get_room_teams(server, room_id, client_id, response);
+
     let room = &server.rooms[room_id];
+    get_room_config(room, client_id, response);
+
+    let mut flag_selectors = [
+        (
+            Flags::RoomMaster,
+            server.collect_nicks(|(_, c)| c.is_master()),
+        ),
+        (Flags::Ready, server.collect_nicks(|(_, c)| c.is_ready())),
+        (Flags::InGame, server.collect_nicks(|(_, c)| c.is_in_game())),
+    ];
+
+    for (flag, nicks) in &mut flag_selectors {
+        response.add(ClientFlags(add_flags(&[*flag]), replace(nicks, vec![])).send_self());
+    }
 
     if !room.greeting.is_empty() {
         response.add(