Merge branch 'main' into new-menu

crates/border-wars/src/lib.rs

@@ -11,9 +11,9 @@ pub mod networking;
 pub mod scenes;
 pub mod ui;
 
-/// The current scene of the game.
+/// A scene of the game.
 #[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States, Component)]
-pub enum CurrentScene {
+pub enum Scene {
     /// When we are in the main menu.
     #[default]
     Menu,
@@ -25,6 +25,9 @@ pub enum CurrentScene {
     Game,
 }
 
+/// The current scene of the game.
+pub type CurrentScene = Scene;
+
 /// A player in the game.
 #[derive(Serialize, Deserialize, Clone, Debug, Component, Resource, PartialEq, Eq, Hash)]
 pub struct Player {