From b4ada77390076bea87b08f257101597685b6c418 Mon Sep 17 00:00:00 2001
From: Melody Madeline Lyons <lily@nowaffles.com>
Date: Thu, 4 Jul 2024 01:26:20 -0700
Subject: [PATCH] Fix AudioFile::default defaulting to 0 volume
---
crates/data/src/shared/audio_file.rs | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/crates/data/src/shared/audio_file.rs b/crates/data/src/shared/audio_file.rs
index 0675851c..79dd4824 100644
--- a/crates/data/src/shared/audio_file.rs
+++ b/crates/data/src/shared/audio_file.rs
@@ -16,7 +16,7 @@
// along with Luminol. If not, see <http://www.gnu.org/licenses/>.
use crate::{optional_path_alox, optional_path_serde, Path};
-#[derive(Default, Debug, Clone, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
#[derive(serde::Deserialize, serde::Serialize)]
#[derive(alox_48::Deserialize, alox_48::Serialize)]
#[marshal(class = "RPG::AudioFile")]
@@ -27,3 +27,13 @@ pub struct AudioFile {
pub volume: u8,
pub pitch: u8,
}
+
+impl Default for AudioFile {
+ fn default() -> Self {
+ Self {
+ name: None,
+ volume: 100,
+ pitch: 100,
+ }
+ }
+}