diff -r 7732013ce64c -r c5a6e8566425 rust/hedgewars-server/src/server/client.rs
--- a/rust/hedgewars-server/src/server/client.rs	Tue May 28 17:49:04 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-use super::coretypes::ClientId;
-use bitflags::*;
-
-bitflags! {
-    pub struct ClientFlags: u16 {
-        const IS_ADMIN = 0b0000_0001;
-        const IS_MASTER = 0b0000_0010;
-        const IS_READY = 0b0000_0100;
-        const IS_IN_GAME = 0b0000_1000;
-        const IS_JOINED_MID_GAME = 0b0001_0000;
-        const IS_CHECKER = 0b0010_0000;
-        const IS_CONTRIBUTOR = 0b0100_0000;
-        const HAS_SUPER_POWER = 0b1000_0000;
-        const IS_REGISTERED = 0b0001_0000_0000;
-
-        const NONE = 0b0000_0000;
-        const DEFAULT = Self::NONE.bits;
-    }
-}
-
-pub struct HWClient {
-    pub id: ClientId,
-    pub room_id: Option<usize>,
-    pub nick: String,
-    pub protocol_number: u16,
-    pub flags: ClientFlags,
-    pub teams_in_game: u8,
-    pub team_indices: Vec<u8>,
-    pub clan: Option<u8>,
-}
-
-impl HWClient {
-    pub fn new(id: ClientId, protocol_number: u16, nick: String) -> HWClient {
-        HWClient {
-            id,
-            nick,
-            protocol_number,
-            room_id: None,
-            flags: ClientFlags::DEFAULT,
-            teams_in_game: 0,
-            team_indices: Vec::new(),
-            clan: None,
-        }
-    }
-
-    fn contains(&self, mask: ClientFlags) -> bool {
-        self.flags.contains(mask)
-    }
-
-    fn set(&mut self, mask: ClientFlags, value: bool) {
-        self.flags.set(mask, value);
-    }
-
-    pub fn is_admin(&self) -> bool {
-        self.contains(ClientFlags::IS_ADMIN)
-    }
-    pub fn is_master(&self) -> bool {
-        self.contains(ClientFlags::IS_MASTER)
-    }
-    pub fn is_ready(&self) -> bool {
-        self.contains(ClientFlags::IS_READY)
-    }
-    pub fn is_in_game(&self) -> bool {
-        self.contains(ClientFlags::IS_IN_GAME)
-    }
-    pub fn is_joined_mid_game(&self) -> bool {
-        self.contains(ClientFlags::IS_JOINED_MID_GAME)
-    }
-    pub fn is_checker(&self) -> bool {
-        self.contains(ClientFlags::IS_CHECKER)
-    }
-    pub fn is_contributor(&self) -> bool {
-        self.contains(ClientFlags::IS_CONTRIBUTOR)
-    }
-    pub fn has_super_power(&self) -> bool {
-        self.contains(ClientFlags::HAS_SUPER_POWER)
-    }
-    pub fn is_registered(&self) -> bool {
-        self.contains(ClientFlags::IS_REGISTERED)
-    }
-
-    pub fn set_is_admin(&mut self, value: bool) {
-        self.set(ClientFlags::IS_ADMIN, value)
-    }
-    pub fn set_is_master(&mut self, value: bool) {
-        self.set(ClientFlags::IS_MASTER, value)
-    }
-    pub fn set_is_ready(&mut self, value: bool) {
-        self.set(ClientFlags::IS_READY, value)
-    }
-    pub fn set_is_in_game(&mut self, value: bool) {
-        self.set(ClientFlags::IS_IN_GAME, value)
-    }
-    pub fn set_is_joined_mid_game(&mut self, value: bool) {
-        self.set(ClientFlags::IS_JOINED_MID_GAME, value)
-    }
-    pub fn set_is_checker(&mut self, value: bool) {
-        self.set(ClientFlags::IS_CHECKER, value)
-    }
-    pub fn set_is_contributor(&mut self, value: bool) {
-        self.set(ClientFlags::IS_CONTRIBUTOR, value)
-    }
-    pub fn set_has_super_power(&mut self, value: bool) {
-        self.set(ClientFlags::HAS_SUPER_POWER, value)
-    }
-    pub fn set_is_registered(&mut self, value: bool) {
-        self.set(ClientFlags::IS_REGISTERED, value)
-    }
-}