From 407a90d3b91afbc02fb7209c6928f4b29027a63f Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 4 Jun 2024 23:50:24 +0200
Subject: use messsage packet for messages not chat

---
 src/game/server.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/game/server.rs')

diff --git a/src/game/server.rs b/src/game/server.rs
index 1f5cc7b..1b4d373 100644
--- a/src/game/server.rs
+++ b/src/game/server.rs
@@ -56,14 +56,12 @@ async fn game_loop(config: Config, state: Arc<State>) {
 struct ClientState {
     pid: Option<u32>,
     alive: bool,
-    username: String,
 }
 
 async fn handle_client(sock: TcpStream, state: Arc<State>) -> Result<()> {
     let mut cstate = ClientState {
         pid: None,
         alive: false,
-        username: "guest".to_string(),
     };
     let res = handle_client_inner(sock, &state, &mut cstate).await;
     if let Some(pid) = cstate.pid {
@@ -87,8 +85,8 @@ async fn handle_client_inner(
     loop {
         tokio::select! {
             message = chat.recv() => {
-                let (player, message) = message?;
-                tx.send_packet(Packet::Chat(format!("{player}: {message}"))).await?;
+                let (id, message) = message?;
+                tx.send_packet(Packet::Message { id, message }).await?;
             },
             new_game = ticks.recv() => {
                 let new_game = new_game?;
@@ -235,7 +233,9 @@ async fn handle_packet(
                     .await?;
                 return Ok(());
             }
-            let _ = state.chat.send((cstate.username.clone(), message));
+            if let Some(pid) = cstate.pid {
+                let _ = state.chat.send((pid, message));
+            }
         }
         _ => {
             tx.send_packet(Packet::Error("clients dont send this packet".to_string()))
-- 
cgit v1.2.3-70-g09d2