Merge branch 'main' into add-resources-system
Some checks failed
Rust Checks / checks (push) Has been cancelled
Rust Checks / checks (pull_request) Successful in 2m51s

This commit is contained in:
CoCo_Sol 2024-04-05 10:44:53 +00:00
commit 5f9efa3873

View file

@ -12,9 +12,9 @@ pub mod resources;
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)]
pub enum CurrentScene {
pub enum Scene {
/// When we are in the main menu.
#[default]
Menu,
@ -26,6 +26,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 {