diff -r 0118b7412570 -r 5fb40c8e5542 gameServer2/src/protocol/messages.rs --- a/gameServer2/src/protocol/messages.rs Fri Sep 07 04:16:05 2018 +0300 +++ b/gameServer2/src/protocol/messages.rs Sun Sep 09 01:20:35 2018 +0300 @@ -100,10 +100,14 @@ RoundFinished, ServerMessage(String), + Notice(String), Warning(String), Error(String), Connected(u32), Unreachable, + + //Deprecated messages + LegacyReady(bool, Vec) } pub fn server_chat(msg: String) -> HWServerMessage { @@ -123,8 +127,8 @@ Ammo(n, None) => ("AMMO".to_string(), vec![n.to_string()]), Ammo(n, Some(s)) => ("AMMO".to_string(), vec![n.to_string(), s.to_string()]), - Scheme(n, None) => ("SCHEME".to_string(), vec![n.to_string()]), - Scheme(n, Some(s)) => ("SCHEME".to_string(), { + Scheme(n, s) if s.is_empty() => ("SCHEME".to_string(), vec![n.to_string()]), + Scheme(n, s) => ("SCHEME".to_string(), { let mut v = vec![n.to_string()]; v.extend(s.clone().into_iter()); v @@ -299,8 +303,13 @@ RoundFinished => msg!["ROUND_FINISHED"], ChatMsg {nick, msg} => msg!["CHAT", nick, msg], ServerMessage(msg) => msg!["SERVER_MESSAGE", msg], + Notice(msg) => msg!["NOTICE", msg], Warning(msg) => msg!["WARNING", msg], Error(msg) => msg!["ERROR", msg], + + LegacyReady(is_ready, nicks) => + construct_message(&[if *is_ready {"READY"} else {"NOT_READY"}], &nicks), + _ => msg!["ERROR", "UNIMPLEMENTED"], } }