dev: added PlayType to base plugin

roboteng · Nov 23, 2023 · 4c6e2ff · 4c6e2ff
1 parent e6333ca
commit 4c6e2ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/game/src/lib.rs b/game/src/lib.rs
@@ -8,7 +8,7 @@ pub mod main_menu;
 pub mod settings_page;
 
 #[derive(Default)]
-pub struct BasePlugin(GameState);
+pub struct BasePlugin(GameState, PlayType);
 impl Plugin for BasePlugin {
     fn build(&self, app: &mut bevy::prelude::App) {
         app.add_state::<GameState>()
@@ -25,8 +25,8 @@ impl Plugin for BasePlugin {
 }
 
 impl BasePlugin {
-    pub fn new(init_state: GameState) -> Self {
-        Self(init_state)
+    pub fn new(init_state: GameState, play: PlayType) -> Self {
+        Self(init_state, play)
     }
 }
 

diff --git a/game/src/main.rs b/game/src/main.rs
@@ -8,7 +8,7 @@ fn main() {
     App::new()
         .add_plugins((
             DefaultPlugins,
-            BasePlugin::new(GameState::MainMenu),
+            BasePlugin::new(GameState::MainMenu, PlayType::None),
             MainMenuPlugin,
             SettingsPlugin,
             InGamePlugin,

diff --git a/game_server/src/main.rs b/game_server/src/main.rs
@@ -6,7 +6,7 @@ fn main() {
     App::new()
         .add_plugins((
             DefaultPlugins,
-            BasePlugin::new(GameState::MainMenu),
+            BasePlugin::new(GameState::InGame, PlayType::Server),
             InGamePlugin,
         ))
         .run();