refactor ship to different module

prateekkumarweb · Apr 11, 2024 · 3b2cf24 · 3b2cf24
1 parent 16f9aad
commit 3b2cf24
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/src/game.rs b/src/game.rs
@@ -1,13 +1,15 @@
+use serde::{Deserialize, Serialize};
 use tokio::{sync::mpsc, task::JoinHandle};
 
 use crate::{
-    message::{PlayerMsg, Ship, SystemMsg},
+    message::{PlayerMsg, SystemMsg},
     player::Player,
 };
 
 #[derive(Debug)]
 pub struct Game {
-    _task: JoinHandle<()>,
+    #[allow(dead_code)]
+    task: JoinHandle<()>,
 }
 
 impl Game {
@@ -22,10 +24,18 @@ impl Game {
             player_state: [PlayerGameState::default(), PlayerGameState::default()],
         };
         let task = actor.run();
-        Self { _task: task }
+        Self { task }
     }
 }
 
+#[derive(Debug, Default, Serialize, Deserialize, Clone, Copy)]
+pub struct Ship {
+    pub x: u8,
+    pub y: u8,
+    pub size: u8,
+    pub vertical: bool,
+    pub sunk: bool,
+}
 struct GameActor {
     players: [Player; 2],
     rxs: (mpsc::Receiver<PlayerMsg>, mpsc::Receiver<PlayerMsg>),

diff --git a/src/message.rs b/src/message.rs
@@ -1,24 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-// #[derive(Debug, Serialize, Deserialize)]
-// #[serde(tag = "type", content = "data")]
-// pub enum Msg {
-//     Connect,
-//     Id(String),
-//     OpponentId(String),
-//     Log(String),
-//     Chat(String),
-//     StartGame(Vec<Ship>),
-// }
-
-#[derive(Debug, Default, Serialize, Deserialize, Clone, Copy)]
-pub struct Ship {
-    pub x: u8,
-    pub y: u8,
-    pub size: u8,
-    pub vertical: bool,
-    pub sunk: bool,
-}
+use crate::game::Ship;
 
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type", content = "data")]

diff --git a/src/player.rs b/src/player.rs
@@ -26,7 +26,8 @@ enum PlayerState {
 pub struct Player {
     id: String,
     state: Arc<Mutex<PlayerState>>,
-    _task: JoinHandle<()>,
+    #[allow(dead_code)]
+    task: JoinHandle<()>,
     sender: mpsc::Sender<SystemMsg>,
     close_tx: oneshot::Sender<()>,
     is_closed: Arc<RwLock<bool>>,
@@ -53,7 +54,7 @@ impl Player {
         Self {
             id,
             state,
-            _task: task,
+            task,
             sender,
             close_tx,
             is_closed,