1 files changed, 10 insertions, 8 deletions
diff --git a/pixel-client/src/main.rs b/pixel-client/src/main.rs
index d1b7e7a9..8c231031 100644
--- a/pixel-client/src/main.rs
+++ b/pixel-client/src/main.rs
@@ -19,7 +19,7 @@
 use clap::{Parser, Subcommand};
 use game::Game;
 use hurrycurry_protocol::glam::Vec2;
-use menu::Menu;
+use menu::main::MainMenu;
 use network::Network;
 use render::Renderer;
 use sdl2::{event::Event, keyboard::KeyboardState, mouse::MouseState, pixels::Color};
@@ -51,7 +51,7 @@ pub enum Action {
 
 pub enum State {
     Ingame(Box<Game>),
-    Menu(Menu),
+    MainMenu(MainMenu),
     Quit,
 }
 
@@ -87,7 +87,7 @@ fn main() {
     let mut renderer = Renderer::init(&texture_creator);
 
     let mut state = match args.action.unwrap_or_default() {
-        Action::Menu => State::Menu(Menu::new(renderer.atlas_layout())),
+        Action::Menu => State::MainMenu(MainMenu::new(renderer.atlas_layout())),
         Action::Join { server_address } => State::Ingame(Box::new(Game::new(
             Network::connect(&server_address).unwrap(),
             renderer.atlas_layout(),
@@ -108,7 +108,9 @@ fn main() {
         let dt = last_tick.elapsed().min(Duration::from_secs_f32(1. / 30.));
         let next = match &mut state {
             State::Ingame(x) => x.tick(dt.as_secs_f32(), &keyboard, renderer.atlas_layout()),
-            State::Menu(x) => x.tick(dt.as_secs_f32(), &keyboard, &mouse, renderer.atlas_layout()),
+            State::MainMenu(x) => {
+                x.tick(dt.as_secs_f32(), &keyboard, &mouse, renderer.atlas_layout())
+            }
             State::Quit => break,
         };
         if let Some(next) = next {
@@ -120,7 +122,7 @@ fn main() {
         renderer.set_ui_view(4.);
         match &mut state {
             State::Ingame(x) => x.draw(&mut renderer),
-            State::Menu(x) => x.draw(&mut renderer),
+            State::MainMenu(x) => x.draw(&mut renderer),
             State::Quit => (),
         }
 
@@ -137,7 +139,7 @@ fn main() {
                     ..
                 } => match &mut state {
                     State::Ingame(_) => (),
-                    State::Menu(menu) => menu.keyboard_event(keycode, false),
+                    State::MainMenu(menu) => menu.keyboard_event(keycode, false),
                     _ => (),
                 },
                 Event::KeyDown {
@@ -145,11 +147,11 @@ fn main() {
                     ..
                 } => match &mut state {
                     State::Ingame(_) => (),
-                    State::Menu(menu) => menu.keyboard_event(keycode, true),
+                    State::MainMenu(menu) => menu.keyboard_event(keycode, true),
                     _ => (),
                 },
                 Event::TextInput { text, .. } => match &mut state {
-                    State::Menu(menu) => menu.ui_state.text_input(text),
+                    State::MainMenu(menu) => menu.ui_state.text_input(text),
                     _ => (),
                 },
                 _ => {}