From ab316017f712be3a6b46f1b2f70ddde09b6e3b06 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 5 Jan 2024 17:22:01 -0500
Subject: [PATCH] removed beatTime nullability?
---
source/funkin/Conductor.hx | 29 +++++++++++++----------------
source/funkin/data/song/SongData.hx | 2 +-
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/source/funkin/Conductor.hx b/source/funkin/Conductor.hx
index 09cdf7df4..05c23108f 100644
--- a/source/funkin/Conductor.hx
+++ b/source/funkin/Conductor.hx
@@ -352,24 +352,21 @@ class Conductor
// Without any custom handling, `currentStepTime` becomes non-zero at `songPosition = 0`.
if (currentTimeChange.timeStamp < 0.0) currentTimeChange.timeStamp = 0.0;
- if (currentTimeChange.beatTime == null)
+ if (currentTimeChange.timeStamp <= 0.0)
{
- if (currentTimeChange.timeStamp <= 0.0)
- {
- currentTimeChange.beatTime = 0.0;
- }
- else
- {
- // Calculate the beat time of this timestamp.
- currentTimeChange.beatTime = 0.0;
+ currentTimeChange.beatTime = 0.0;
+ }
+ else
+ {
+ // Calculate the beat time of this timestamp.
+ currentTimeChange.beatTime = 0.0;
- if (currentTimeChange.timeStamp > 0.0 && timeChanges.length > 0)
- {
- var prevTimeChange:SongTimeChange = timeChanges[timeChanges.length - 1];
- currentTimeChange.beatTime = FlxMath.roundDecimal(prevTimeChange.beatTime
- + ((currentTimeChange.timeStamp - prevTimeChange.timeStamp) * prevTimeChange.bpm / Constants.SECS_PER_MIN / Constants.MS_PER_SEC),
- 4);
- }
+ if (currentTimeChange.timeStamp > 0.0 && timeChanges.length > 0)
+ {
+ var prevTimeChange:SongTimeChange = timeChanges[timeChanges.length - 1];
+ currentTimeChange.beatTime = FlxMath.roundDecimal(prevTimeChange.beatTime
+ + ((currentTimeChange.timeStamp - prevTimeChange.timeStamp) * prevTimeChange.bpm / Constants.SECS_PER_MIN / Constants.MS_PER_SEC),
+ 4);
}
}
diff --git a/source/funkin/data/song/SongData.hx b/source/funkin/data/song/SongData.hx
index 98cee3f17..66874e5be 100644
--- a/source/funkin/data/song/SongData.hx
+++ b/source/funkin/data/song/SongData.hx
@@ -149,7 +149,7 @@ class SongTimeChange
*/
@:optional
@:alias("b")
- public var beatTime:Null<Float>;
+ public var beatTime:Float;
/**
* Quarter notes per minute (float). Cannot be empty in the first element of the list,