tutorials/roguelike-game
1
0
Fork 0
Code Releases Activity

Fix some main menu-related code

Browse Source
This commit is contained in:
Timothy Warren 2021-11-09 10:38:56 -05:00
parent a307521d64
commit 1330386b52
2 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui.rs
View File

@ -477,7 +477,7 @@ pub fn main_menu(gs: &mut State, ctx: &mut Rltk) -> MainMenuResult {
Some(key) => match key { Some(key) => match key {
VirtualKeyCode::Escape => { VirtualKeyCode::Escape => {
return MainMenuResult::NoSelection { return MainMenuResult::NoSelection {
selected: selection, selected: MainMenuSelection::Quit,
} }
} }
VirtualKeyCode::Up => { VirtualKeyCode::Up => {

32
src/main.rs
View File

@ -110,24 +110,7 @@ impl GameState for State {
ctx.cls(); ctx.cls();
match newrunstate { match newrunstate {
RunState::MainMenu { .. } => match gui::main_menu(self, ctx) { RunState::MainMenu { .. } => {}
gui::MainMenuResult::NoSelection { selected } => {
newrunstate = RunState::MainMenu {
menu_selection: selected,
}
}
gui::MainMenuResult::Selected { selected } => match selected {
gui::MainMenuSelection::NewGame => newrunstate = RunState::PreRun,
gui::MainMenuSelection::LoadGame => {
saveload_system::load_game(&mut self.ecs);
newrunstate = RunState::AwaitingInput;
saveload_system::delete_save();
}
gui::MainMenuSelection::Quit => {
::std::process::exit(0);
}
},
},
_ => { _ => {
// Draw the UI // Draw the UI
draw_map(&self.ecs, ctx); draw_map(&self.ecs, ctx);
@ -244,9 +227,7 @@ impl GameState for State {
} }
} }
} }
RunState::MainMenu { .. } => { RunState::MainMenu { .. } => match gui::main_menu(self, ctx) {
let result = gui::main_menu(self, ctx);
match result {
gui::MainMenuResult::NoSelection { selected } => { gui::MainMenuResult::NoSelection { selected } => {
newrunstate = RunState::MainMenu { newrunstate = RunState::MainMenu {
menu_selection: selected, menu_selection: selected,
@ -254,13 +235,16 @@ impl GameState for State {
} }
gui::MainMenuResult::Selected { selected } => match selected { gui::MainMenuResult::Selected { selected } => match selected {
gui::MainMenuSelection::NewGame => newrunstate = RunState::PreRun, gui::MainMenuSelection::NewGame => newrunstate = RunState::PreRun,
gui::MainMenuSelection::LoadGame => newrunstate = RunState::PreRun, gui::MainMenuSelection::LoadGame => {
saveload_system::load_game(&mut self.ecs);
newrunstate = RunState::AwaitingInput;
saveload_system::delete_save();
}
gui::MainMenuSelection::Quit => { gui::MainMenuSelection::Quit => {
::std::process::exit(0); ::std::process::exit(0);
} }
}, },
} },
}
RunState::SaveGame => { RunState::SaveGame => {
saveload_system::save_game(&mut self.ecs); saveload_system::save_game(&mut self.ecs);