From 68c85d9214bc8e6d36bdb7af019855618a78b356 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Thu, 10 Aug 2023 15:34:40 -0400 Subject: [PATCH] Made the currently-unused Divisions field optional. --- source/funkin/play/song/Song.hx | 2 +- source/funkin/play/song/SongData.hx | 4 ++-- source/funkin/play/song/SongValidator.hx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/funkin/play/song/Song.hx b/source/funkin/play/song/Song.hx index 398c28753..ec89d8706 100644 --- a/source/funkin/play/song/Song.hx +++ b/source/funkin/play/song/Song.hx @@ -297,7 +297,7 @@ class SongDifficulty public var songName:String = SongValidator.DEFAULT_SONGNAME; public var songArtist:String = SongValidator.DEFAULT_ARTIST; public var timeFormat:SongTimeFormat = SongValidator.DEFAULT_TIMEFORMAT; - public var divisions:Int = SongValidator.DEFAULT_DIVISIONS; + public var divisions:Null = SongValidator.DEFAULT_DIVISIONS; public var looped:Bool = SongValidator.DEFAULT_LOOPED; public var generatedBy:String = SongValidator.DEFAULT_GENERATEDBY; diff --git a/source/funkin/play/song/SongData.hx b/source/funkin/play/song/SongData.hx index 6f2475cf9..fbd7e3383 100644 --- a/source/funkin/play/song/SongData.hx +++ b/source/funkin/play/song/SongData.hx @@ -269,7 +269,7 @@ typedef RawSongMetadata = var songName:String; var artist:String; var timeFormat:SongTimeFormat; - var divisions:Int; + var divisions:Null; // Optional field var timeChanges:Array; var looped:Bool; var playData:SongPlayData; @@ -292,7 +292,7 @@ abstract SongMetadata(RawSongMetadata) songName: songName, artist: artist, timeFormat: 'ms', - divisions: 96, + divisions: null, timeChanges: [new SongTimeChange(-1, 0, 100, 4, 4, [4, 4, 4, 4])], looped: false, playData: diff --git a/source/funkin/play/song/SongValidator.hx b/source/funkin/play/song/SongValidator.hx index 936ad46f7..d91dda1d9 100644 --- a/source/funkin/play/song/SongValidator.hx +++ b/source/funkin/play/song/SongValidator.hx @@ -15,7 +15,7 @@ class SongValidator public static final DEFAULT_SONGNAME:String = "Unknown"; public static final DEFAULT_ARTIST:String = "Unknown"; public static final DEFAULT_TIMEFORMAT:SongTimeFormat = SongTimeFormat.MILLISECONDS; - public static final DEFAULT_DIVISIONS:Int = -1; + public static final DEFAULT_DIVISIONS:Null = null; public static final DEFAULT_LOOPED:Bool = false; public static final DEFAULT_STAGE:String = "mainStage"; public static final DEFAULT_SCROLLSPEED:Float = 1.0;