cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-29 02:04:28 +00:00
Code Issues Releases Wiki Activity

Made the currently-unused Divisions field optional.

Browse source
This commit is contained in:
EliteMasterEric 2023-08-10 15:34:40 -04:00
parent 6096f12307
commit 68c85d9214
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/play/song/Song.hx
View file

@ -297,7 +297,7 @@ class SongDifficulty
public var songName:String = SongValidator.DEFAULT_SONGNAME; public var songName:String = SongValidator.DEFAULT_SONGNAME;
public var songArtist:String = SongValidator.DEFAULT_ARTIST; public var songArtist:String = SongValidator.DEFAULT_ARTIST;
public var timeFormat:SongTimeFormat = SongValidator.DEFAULT_TIMEFORMAT; public var timeFormat:SongTimeFormat = SongValidator.DEFAULT_TIMEFORMAT;
public var divisions:Int = SongValidator.DEFAULT_DIVISIONS; public var divisions:Null<Int> = SongValidator.DEFAULT_DIVISIONS;
public var looped:Bool = SongValidator.DEFAULT_LOOPED; public var looped:Bool = SongValidator.DEFAULT_LOOPED;
public var generatedBy:String = SongValidator.DEFAULT_GENERATEDBY; public var generatedBy:String = SongValidator.DEFAULT_GENERATEDBY;

4
source/funkin/play/song/SongData.hx
View file

@ -269,7 +269,7 @@ typedef RawSongMetadata =
var songName:String; var songName:String;
var artist:String; var artist:String;
var timeFormat:SongTimeFormat; var timeFormat:SongTimeFormat;
var divisions:Int; var divisions:Null<Int>; // Optional field
var timeChanges:Array<SongTimeChange>; var timeChanges:Array<SongTimeChange>;
var looped:Bool; var looped:Bool;
var playData:SongPlayData; var playData:SongPlayData;
@ -292,7 +292,7 @@ abstract SongMetadata(RawSongMetadata)
songName: songName, songName: songName,
artist: artist, artist: artist,
timeFormat: 'ms', timeFormat: 'ms',
divisions: 96, divisions: null,
timeChanges: [new SongTimeChange(-1, 0, 100, 4, 4, [4, 4, 4, 4])], timeChanges: [new SongTimeChange(-1, 0, 100, 4, 4, [4, 4, 4, 4])],
looped: false, looped: false,
playData: playData:

2
source/funkin/play/song/SongValidator.hx
View file

@ -15,7 +15,7 @@ class SongValidator
public static final DEFAULT_SONGNAME:String = "Unknown"; public static final DEFAULT_SONGNAME:String = "Unknown";
public static final DEFAULT_ARTIST:String = "Unknown"; public static final DEFAULT_ARTIST:String = "Unknown";
public static final DEFAULT_TIMEFORMAT:SongTimeFormat = SongTimeFormat.MILLISECONDS; public static final DEFAULT_TIMEFORMAT:SongTimeFormat = SongTimeFormat.MILLISECONDS;
public static final DEFAULT_DIVISIONS:Int = -1; public static final DEFAULT_DIVISIONS:Null<Int> = null;
public static final DEFAULT_LOOPED:Bool = false; public static final DEFAULT_LOOPED:Bool = false;
public static final DEFAULT_STAGE:String = "mainStage"; public static final DEFAULT_STAGE:String = "mainStage";
public static final DEFAULT_SCROLLSPEED:Float = 1.0; public static final DEFAULT_SCROLLSPEED:Float = 1.0;