Remove usage of macdeployqt in favor of CMake BundleUtilities. BundleUtilities properly finds all dependencies and adds them to the .app automatically. It also fixes rpath and install_name issues for any of the binaries or dependencies
use super::coretypes::ClientId;
use bitflags::*;
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 IS_CHECKER = 0b0010_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 web_password: String,
pub server_salt: 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, salt: String) -> HWClient {
HWClient {
id,
room_id: None,
nick: String::new(),
web_password: String::new(),
server_salt: salt,
protocol_number: 0,
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 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) }
}