diff -r 24828281c9c5 -r 7515ae6010bb rust/hedgewars-engine-messages/src/messages.rs --- a/rust/hedgewars-engine-messages/src/messages.rs Thu Jul 25 00:05:30 2019 +0300 +++ b/rust/hedgewars-engine-messages/src/messages.rs Thu Jul 25 14:23:25 2019 +0200 @@ -28,7 +28,6 @@ TeamControlLost(String), TimeWrap, Taunt(u8), - HogSay(String), Heartbeat, } @@ -36,14 +35,15 @@ pub enum UnsyncedEngineMessage { TeamControlGained(String), TeamControlLost(String), + HogSay(String), + ChatMessage(String), + TeamMessage(String), } #[derive(Debug, PartialEq, Clone)] pub enum UnorderedEngineMessage { Ping, Pong, - ChatMessage(String), - TeamMessage(String), Error(String), Warning(String), StopSyncing, @@ -194,7 +194,6 @@ TeamControlGained(str) => ems![b'g', str], TeamControlLost(str) => ems![b'f', str], Taunt(s) => vec![b't', *s], - HogSay(str) => ems![b'h', str], Heartbeat => em![b'+'], TimeWrap => unreachable!(), } @@ -207,6 +206,9 @@ match self { TeamControlGained(str) => ems![b'G', str], TeamControlLost(str) => ems![b'F', str], + HogSay(str) => ems![b'h', str], + ChatMessage(str) => ems![b's', str], + TeamMessage(str) => ems![b'b', str], } } } @@ -217,8 +219,6 @@ match self { Ping => em![b'?'], Pong => em![b'!'], - ChatMessage(str) => ems![b's', str], - TeamMessage(str) => ems![b'b', str], Error(str) => ems![b'E', str], Warning(_) => unreachable!(), StopSyncing => unreachable!(),