From 4e2a80b3ac2823509552b5f98071c01a69b5a275 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Sun, 26 Feb 2023 15:50:53 +0100
Subject: [PATCH] fixed bpm stuff

---
 buildnumber.txt                       |  2 +-
 source/funkin/chart/BaseGameParser.hx |  2 ++
 source/funkin/chart/Chart.hx          | 13 ++++++++++++-
 source/funkin/chart/ChartData.hx      |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/buildnumber.txt b/buildnumber.txt
index d97f2fad..1ead6050 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-2392
\ No newline at end of file
+2393
\ No newline at end of file
diff --git a/source/funkin/chart/BaseGameParser.hx b/source/funkin/chart/BaseGameParser.hx
index e97427f3..4deeaa6f 100644
--- a/source/funkin/chart/BaseGameParser.hx
+++ b/source/funkin/chart/BaseGameParser.hx
@@ -38,6 +38,8 @@ class BaseGameParser {
             });
         }
 
+        result.meta.bpm = data.bpm;
+
         var camFocusedBF:Bool = false;
         var beatsPerMesure:Float = data.beatsPerMesure.getDefault(4);
         var curBPM:Float = data.bpm;
diff --git a/source/funkin/chart/Chart.hx b/source/funkin/chart/Chart.hx
index 6b6058c8..e4eae36e 100644
--- a/source/funkin/chart/Chart.hx
+++ b/source/funkin/chart/Chart.hx
@@ -78,7 +78,9 @@ class Chart {
             strumLines: [],
             noteTypes: [],
             events: [],
-            meta: null,
+            meta: {
+                name: null
+            },
             scrollSpeed: 2,
             stage: "stage",
             codenameChart: true,
@@ -106,6 +108,15 @@ class Chart {
 
         if (base.meta == null)
             base.meta = loadChartMeta(songName, difficulty, base.fromMods);
+        else {
+            var loadedMeta = loadChartMeta(songName, difficulty, base.fromMods);
+            for(field in Reflect.fields(base.meta)) {
+                var f = Reflect.field(base.meta, field);
+                if (f != null)
+                    Reflect.setField(loadedMeta, field, f);
+            }
+            base.meta = loadedMeta;
+        }
         return base;
     }
 
diff --git a/source/funkin/chart/ChartData.hx b/source/funkin/chart/ChartData.hx
index b32936f4..899ae6a1 100644
--- a/source/funkin/chart/ChartData.hx
+++ b/source/funkin/chart/ChartData.hx
@@ -16,7 +16,7 @@ typedef ChartData = {
 
 typedef ChartMetaData = {
     public var name:String;
-    public var bpm:Float;
+    public var ?bpm:Float;
     public var ?displayName:String;
     public var ?beatsPerMesure:Float;
     public var ?stepsPerBeat:Float;