--- a/gameServer2/src/server/client.rs Sat Jul 21 00:34:32 2018 +0200
+++ b/gameServer2/src/server/client.rs Sat Jul 21 02:06:13 2018 +0200
@@ -1,18 +1,27 @@
use super::coretypes::ClientId;
+bitflags!{
+ pub struct ClientFlags: u8 {
+ 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 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: u32,
- pub is_admin: bool,
- pub is_master: bool,
- pub is_ready: bool,
- pub is_in_game: bool,
+ pub protocol_number: u16,
+ pub flags: ClientFlags,
pub teams_in_game: u8,
pub team_indices: Vec<u8>,
- pub clan: Option<u8>,
- pub is_joined_mid_game: bool,
+ pub clan: Option<u8>
}
impl HWClient {
@@ -22,14 +31,30 @@
room_id: None,
nick: String::new(),
protocol_number: 0,
- is_admin: false,
- is_master: false,
- is_ready: false,
- is_in_game: false,
+ flags: ClientFlags::DEFAULT,
teams_in_game: 0,
team_indices: Vec::new(),
clan: None,
- is_joined_mid_game: false,
}
}
+
+ 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 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) }
}
\ No newline at end of file