evan/ludum-dare-50
Archived
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the rest of the merge issues

Browse Source
This commit is contained in:
Evan Pratten 2022-04-02 11:32:50 -04:00
parent 36521d918a
commit bc7fb12564
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/game_logic/src/scenes/main_menu.rs
View File

@ -89,7 +89,7 @@ impl MainMenu {
draw.draw_text("Start Game", 103, 191, 34, Color::GRAY); draw.draw_text("Start Game", 103, 191, 34, Color::GRAY);
draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); draw.draw_text("Start Game", 100, 190, 34, Color::BLACK);
if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) {
return true; return MenuStateSignal::StartGame;
} }
} }
@ -98,7 +98,6 @@ impl MainMenu {
draw.draw_text("Options", 100, 250, 34, Color::BLACK); draw.draw_text("Options", 100, 250, 34, Color::BLACK);
} }
if mouse_x >= 100 && mouse_y >= 410 && mouse_x <= 222 && mouse_y <= 437 { if mouse_x >= 100 && mouse_y >= 410 && mouse_x <= 222 && mouse_y <= 437 {
draw.draw_text("Credits", 103, 411, 34, Color::GRAY); draw.draw_text("Credits", 103, 411, 34, Color::GRAY);
draw.draw_text("Credits", 100, 410, 34, Color::BLACK); draw.draw_text("Credits", 100, 410, 34, Color::BLACK);
@ -112,7 +111,6 @@ impl MainMenu {
draw.draw_text("Exit", 103, 551, 34, Color::GRAY); draw.draw_text("Exit", 103, 551, 34, Color::GRAY);
draw.draw_text("Exit", 100, 550, 34, Color::BLACK); draw.draw_text("Exit", 100, 550, 34, Color::BLACK);
} }
}
// Return MenuStateSignal::StartGame if you want the game to start. // Return MenuStateSignal::StartGame if you want the game to start.
// Otherwise, keep returning MenuStateSignal::DoMainMenu until the player clicks the start button // Otherwise, keep returning MenuStateSignal::DoMainMenu until the player clicks the start button
@ -127,7 +125,6 @@ impl MainMenu {
global_resources: &GlobalResources, global_resources: &GlobalResources,
constants: &ProjectConstants, constants: &ProjectConstants,
) -> MenuStateSignal { ) -> MenuStateSignal {
return MenuStateSignal::DoOptions; return MenuStateSignal::DoOptions;
} }
@ -139,7 +136,6 @@ impl MainMenu {
global_resources: &GlobalResources, global_resources: &GlobalResources,
constants: &ProjectConstants, constants: &ProjectConstants,
) -> MenuStateSignal { ) -> MenuStateSignal {
return MenuStateSignal::DoCredits; return MenuStateSignal::DoCredits;
} }
@ -151,8 +147,6 @@ impl MainMenu {
global_resources: &GlobalResources, global_resources: &GlobalResources,
constants: &ProjectConstants, constants: &ProjectConstants,
) -> MenuStateSignal { ) -> MenuStateSignal {
return MenuStateSignal::DoLeaderboard; return MenuStateSignal::DoLeaderboard;
} }
} }