From 0c470d31bbfba56528e940f2dd0239fb55b7d1ca Mon Sep 17 00:00:00 2001 From: Cherry Date: Sun, 17 Dec 2023 02:25:58 -0500 Subject: [PATCH] don't implement `Default` for `MainMenuChoice` --- pets-gd/scenes/battle_engine.tscn | 4 ++++ pets-lib/src/main_menu.rs | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pets-gd/scenes/battle_engine.tscn b/pets-gd/scenes/battle_engine.tscn index 0ca8e452..ebb98ba2 100644 --- a/pets-gd/scenes/battle_engine.tscn +++ b/pets-gd/scenes/battle_engine.tscn @@ -238,6 +238,7 @@ value = 80.0 show_percentage = false [node name="Label" type="RichTextLabel" parent="Menu/DualMenu/RightPanel/Margins/InfoBars/ManaBar"] +layout_mode = 0 offset_left = 40.0 offset_right = 496.0 offset_bottom = 66.0 @@ -249,6 +250,7 @@ fit_content = true autowrap_mode = 0 [node name="Slash" type="RichTextLabel" parent="Menu/DualMenu/RightPanel/Margins/InfoBars/ManaBar"] +layout_mode = 0 offset_left = 672.0 offset_right = 752.0 offset_bottom = 66.0 @@ -259,6 +261,7 @@ text = " /" autowrap_mode = 0 [node name="Max" type="RichTextLabel" parent="Menu/DualMenu/RightPanel/Margins/InfoBars/ManaBar"] +layout_mode = 0 offset_left = 704.0 offset_right = 936.0 offset_bottom = 66.0 @@ -271,6 +274,7 @@ fit_content = true autowrap_mode = 0 [node name="Value" type="RichTextLabel" parent="Menu/DualMenu/RightPanel/Margins/InfoBars/ManaBar"] +layout_mode = 0 offset_left = 392.0 offset_right = 616.0 offset_bottom = 66.0 diff --git a/pets-lib/src/main_menu.rs b/pets-lib/src/main_menu.rs index 19f676ee..7fd7fcd6 100644 --- a/pets-lib/src/main_menu.rs +++ b/pets-lib/src/main_menu.rs @@ -14,11 +14,9 @@ use crate::prelude::*; use num_derive::FromPrimitive; use num_traits::FromPrimitive; -#[derive(Debug, Default, FromPrimitive)] +#[derive(Debug, FromPrimitive)] enum MainMenuChoice { - #[default] Play, - Options, Credits, Quit,