diff -r c3971b38bbfa -r ee84e417d8d0 rust/hedgewars-network-protocol/src/messages.rs --- a/rust/hedgewars-network-protocol/src/messages.rs Sat Jun 26 00:13:28 2021 +0200 +++ b/rust/hedgewars-network-protocol/src/messages.rs Wed Jun 30 00:18:53 2021 +0200 @@ -107,9 +107,9 @@ ProtocolFlags::format('-', flags) } -#[derive(Debug)] +#[derive(PartialEq, Eq, Clone, Debug)] pub enum HwServerMessage { - Connected(u32), + Connected(String, u32), Redirect(u16), Ping, @@ -151,7 +151,6 @@ Notice(String), Warning(String), Error(String), - Unreachable, //Deprecated messages LegacyReady(bool, Vec), @@ -370,11 +369,7 @@ match self { Ping => msg!["PING"], Pong => msg!["PONG"], - Connected(protocol_version) => msg![ - "CONNECTED", - "Hedgewars server https://www.hedgewars.org/", - protocol_version - ], + Connected(message, protocol_version) => msg!["CONNECTED", message, protocol_version], Redirect(port) => msg!["REDIRECT", port], Bye(msg) => msg!["BYE", msg], Nick(nick) => msg!["NICK", nick], @@ -414,8 +409,6 @@ LegacyReady(is_ready, nicks) => { construct_message(&[if *is_ready { "READY" } else { "NOT_READY" }], &nicks) } - - _ => msg!["ERROR", "UNIMPLEMENTED"], } } }