Skip to content

Commit 6beb58a

Browse files
committed
Merge branch 'Time-Signature-Changes' of https://github.com/NyxieFemboy/CodenameEngine into Time-Signature-Changes
2 parents a345f91 + 2cde5bf commit 6beb58a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

source/funkin/backend/chart/ChartData.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ typedef ChartMetaData = {
1919
public var ?bpm:Float;
2020
public var ?displayName:String;
2121
public var ?beatsPerMeasure:Float;
22-
public var ?stepsPerBeat:Float;
22+
public var ?stepsPerBeat:Int;
2323
public var ?needsVoices:Bool;
2424
public var ?icon:String;
2525
public var ?color:Dynamic;

source/funkin/backend/utils/CoolUtil.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ class CoolUtil
394394

395395
var timeSignParsed:Array<Null<Float>> = musicInfo["TimeSignature"] == null ? [] : [for(s in musicInfo["TimeSignature"].split("/")) Std.parseFloat(s)];
396396
var beatsPerMeasure:Float = 4;
397-
var stepsPerBeat:Float = 4;
397+
var stepsPerBeat:Int = 4;
398398

399399
// Check later, i dont think timeSignParsed can contain null, only nan
400400
if (timeSignParsed.length == 2 && !timeSignParsed.contains(null)) {

0 commit comments

Comments
 (0)