diff -r f748a72432f2 -r d79795acaa73 gameServer2/src/protocol/messages.rs --- a/gameServer2/src/protocol/messages.rs Fri Jul 06 21:03:03 2018 +0300 +++ b/gameServer2/src/protocol/messages.rs Sat Jul 07 20:22:31 2018 +0300 @@ -1,4 +1,7 @@ -use server::coretypes::{ServerVar, GameCfg, TeamInfo, HedgehogInfo}; +use server::coretypes::{ + ServerVar, GameCfg, TeamInfo, + HedgehogInfo, VoteType +}; use std::{ops, convert::From, iter::once}; #[derive(PartialEq, Eq, Clone, Debug)] @@ -56,9 +59,9 @@ Fix, Unfix, Greeting(String), - CallVote(Option<(String, Option)>), - Vote(String), - ForceVote(String), + CallVote(Option), + Vote(bool), + ForceVote(bool), Save(String, String), Delete(String), SaveRoom(String), @@ -90,6 +93,7 @@ TeamColor(String, u8), HedgehogsNumber(String, u8), ConfigEntry(String, Vec), + Kicked, RunGame, ForwardEngineMessage(Vec), RoundFinished, @@ -101,6 +105,10 @@ Unreachable, } +pub fn server_chat(msg: &str) -> HWServerMessage { + HWServerMessage::ChatMsg{ nick: "[server]".to_string(), msg: msg.to_string() } +} + impl GameCfg { pub fn to_protocol(&self) -> (String, Vec) { use server::coretypes::GameCfg::*; @@ -280,6 +288,7 @@ HedgehogsNumber(name, number) => msg!["HH_NUM", name, number], ConfigEntry(name, values) => construct_message(&["CFG", name], &values), + Kicked => msg!["KICKED"], RunGame => msg!["RUN_GAME"], ForwardEngineMessage(em) => construct_message(&["EM"], &em),