gamenet: Add function to decode message given its ID

heinrich5991 · Aug 14, 2024 · 835e9ea · 835e9ea
1 parent 08db817
commit 835e9ea
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 0 deletions.
diff --git a/gamenet/ddnet/src/msg/mod.rs b/gamenet/ddnet/src/msg/mod.rs
@@ -44,3 +44,12 @@ pub fn decode<'a, W>(warn: &mut W, p: &mut Unpacker<'a>)
     libtw2_gamenet_common::msg::decode(warn, Protocol, p)
 }
 
+pub fn decode_msg<'a, W>(warn: &mut W, id: SystemOrGame<MessageId, MessageId>, p: &mut Unpacker<'a>)
+    -> Result<SystemOrGame<System<'a>, Game<'a>>, Error>
+    where W: Warn<Warning>
+{
+    Ok(match id {
+        SystemOrGame::System(id) => SystemOrGame::System(System::decode_msg(warn, id, p)?),
+        SystemOrGame::Game(id) => SystemOrGame::Game(Game::decode_msg(warn, id, p)?),
+    })
+}
diff --git a/gamenet/generate/datatypes.py b/gamenet/generate/datatypes.py
@@ -679,6 +679,16 @@ def emit_msg_module():
 {
     libtw2_gamenet_common::msg::decode(warn, Protocol, p)
 }
+
+pub fn decode_msg<'a, W>(warn: &mut W, id: SystemOrGame<MessageId, MessageId>, p: &mut Unpacker<'a>)
+    -> Result<SystemOrGame<System<'a>, Game<'a>>, Error>
+    where W: Warn<Warning>
+{
+    Ok(match id {
+        SystemOrGame::System(id) => SystemOrGame::System(System::decode_msg(warn, id, p)?),
+        SystemOrGame::Game(id) => SystemOrGame::Game(Game::decode_msg(warn, id, p)?),
+    })
+}\
 """)
 
 def emit_traits_module():

diff --git a/gamenet/teeworlds-0.5/src/msg/mod.rs b/gamenet/teeworlds-0.5/src/msg/mod.rs
@@ -44,3 +44,12 @@ pub fn decode<'a, W>(warn: &mut W, p: &mut Unpacker<'a>)
     libtw2_gamenet_common::msg::decode(warn, Protocol, p)
 }
 
+pub fn decode_msg<'a, W>(warn: &mut W, id: SystemOrGame<MessageId, MessageId>, p: &mut Unpacker<'a>)
+    -> Result<SystemOrGame<System<'a>, Game<'a>>, Error>
+    where W: Warn<Warning>
+{
+    Ok(match id {
+        SystemOrGame::System(id) => SystemOrGame::System(System::decode_msg(warn, id, p)?),
+        SystemOrGame::Game(id) => SystemOrGame::Game(Game::decode_msg(warn, id, p)?),
+    })
+}
diff --git a/gamenet/teeworlds-0.6/src/msg/mod.rs b/gamenet/teeworlds-0.6/src/msg/mod.rs
@@ -44,3 +44,12 @@ pub fn decode<'a, W>(warn: &mut W, p: &mut Unpacker<'a>)
     libtw2_gamenet_common::msg::decode(warn, Protocol, p)
 }
 
+pub fn decode_msg<'a, W>(warn: &mut W, id: SystemOrGame<MessageId, MessageId>, p: &mut Unpacker<'a>)
+    -> Result<SystemOrGame<System<'a>, Game<'a>>, Error>
+    where W: Warn<Warning>
+{
+    Ok(match id {
+        SystemOrGame::System(id) => SystemOrGame::System(System::decode_msg(warn, id, p)?),
+        SystemOrGame::Game(id) => SystemOrGame::Game(Game::decode_msg(warn, id, p)?),
+    })
+}
diff --git a/gamenet/teeworlds-0.7/src/msg/mod.rs b/gamenet/teeworlds-0.7/src/msg/mod.rs
@@ -44,3 +44,12 @@ pub fn decode<'a, W>(warn: &mut W, p: &mut Unpacker<'a>)
     libtw2_gamenet_common::msg::decode(warn, Protocol, p)
 }
 
+pub fn decode_msg<'a, W>(warn: &mut W, id: SystemOrGame<MessageId, MessageId>, p: &mut Unpacker<'a>)
+    -> Result<SystemOrGame<System<'a>, Game<'a>>, Error>
+    where W: Warn<Warning>
+{
+    Ok(match id {
+        SystemOrGame::System(id) => SystemOrGame::System(System::decode_msg(warn, id, p)?),
+        SystemOrGame::Game(id) => SystemOrGame::Game(Game::decode_msg(warn, id, p)?),
+    })
+}