gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chart parsing fix maybe? Changing stepsPerBeat to an Int

Browse Source
This commit is contained in:
NyxieFemboy
2024-10-17 18:08:29 -04:00
parent ea493cd9ad
commit cc83f26e1e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -8,4 +8,4 @@ latest/windows/haxe/
.haxelib/ .haxelib/
pages/ pages/
docs/doc.xml docs/doc.xml
mods/Baldi's Basics in Funkin'/ mods/
source/funkin/backend/chart/FNFLegacyParser.hx
+1 -1
View File
@@ -109,7 +109,7 @@ class FNFLegacyParser {
}); });
} }
if (section.sectionBeats != beatsPerMeasure) { if (section.sectionBeats != null && section.sectionBeats != beatsPerMeasure) {
beatsPerMeasure = section.sectionBeats != null ? section.sectionBeats : data.beatsPerMeasure.getDefault(4); beatsPerMeasure = section.sectionBeats != null ? section.sectionBeats : data.beatsPerMeasure.getDefault(4);
result.events.push({ result.events.push({
source/funkin/backend/system/Conductor.hx
+4 -4
View File
@@ -11,7 +11,7 @@ class BPMChangeEvent {
public var songTime:Float; public var songTime:Float;
public var bpm:Float; public var bpm:Float;
public var beatsPerMeasure:Float; public var beatsPerMeasure:Float;
public var stepsPerBeat:Float; public var stepsPerBeat:Int;
} }
final class Conductor final class Conductor
@@ -48,7 +48,7 @@ final class Conductor
/** /**
* Number of steps per beat (bottom number in time signature). Defaults to 4. * Number of steps per beat (bottom number in time signature). Defaults to 4.
*/ */
public static var stepsPerBeat:Float = 4; public static var stepsPerBeat:Int = 4;
/** /**
@@ -137,7 +137,7 @@ final class Conductor
var curBPM:Float = song.meta.bpm; var curBPM:Float = song.meta.bpm;
var curBeatsPerMeasure:Float = song.meta.beatsPerMeasure.getDefault(4); var curBeatsPerMeasure:Float = song.meta.beatsPerMeasure.getDefault(4);
var curStepsPerBeat:Float = song.meta.stepsPerBeat.getDefault(4); var curStepsPerBeat:Int = song.meta.stepsPerBeat.getDefault(4);
var songTime:Float = 0; var songTime:Float = 0;
var stepTime:Float = 0; var stepTime:Float = 0;
@@ -305,7 +305,7 @@ final class Conductor
} }
} }
public static function changeBPM(newBpm:Float, newBeatsPerMeasure:Float = 4, newStepsPerBeat:Float = 4) public static function changeBPM(newBpm:Float, newBeatsPerMeasure:Float = 4, newStepsPerBeat:Int = 4)
{ {
var timesignChange = (beatsPerMeasure != newBeatsPerMeasure || stepsPerBeat != newStepsPerBeat); var timesignChange = (beatsPerMeasure != newBeatsPerMeasure || stepsPerBeat != newStepsPerBeat);
var bpmChange = (bpm != newBpm); var bpmChange = (bpm != newBpm);