cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-03-20 17:09:21 +00:00
Code Issues Releases Wiki Activity

Fix to launching directly into Chart Editor

Browse source
This commit is contained in:
EliteMasterEric 2023-12-19 01:26:43 -05:00
parent 3e65e7ecc5
commit bb0fb02813
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/funkin/Conductor.hx
View file

@ -37,7 +37,7 @@ class Conductor
/**
* The most recent time change for the current song position.
*/
public static var currentTimeChange(default, null):SongTimeChange;
public static var currentTimeChange(default, null):Null<SongTimeChange>;
/**
* The current position in the song in milliseconds.
@ -132,32 +132,32 @@ class Conductor
/**
* Current position in the song, in measures.
*/
public static var currentMeasure(default, null):Int;
public static var currentMeasure(default, null):Int = 0;
/**
* Current position in the song, in beats.
*/
public static var currentBeat(default, null):Int;
public static var currentBeat(default, null):Int = 0;
/**
* Current position in the song, in steps.
*/
public static var currentStep(default, null):Int;
public static var currentStep(default, null):Int = 0;
/**
* Current position in the song, in measures and fractions of a measure.
*/
public static var currentMeasureTime(default, null):Float;
public static var currentMeasureTime(default, null):Float = 0;
/**
* Current position in the song, in beats and fractions of a measure.
*/
public static var currentBeatTime(default, null):Float;
public static var currentBeatTime(default, null):Float = 0;
/**
* Current position in the song, in steps and fractions of a step.
*/
public static var currentStepTime(default, null):Float;
public static var currentStepTime(default, null):Float = 0;
/**
* An offset tied to the current chart file to compensate for a delay in the instrumental.

2
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -4387,7 +4387,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
playbarNoteSnap.text = '1/${noteSnapQuant}';
playbarDifficulty.text = "Difficulty: " + selectedDifficulty.toTitleCase();
playbarBPM.text = "BPM: " + Conductor.currentTimeChange.bpm;
playbarBPM.text = "BPM: " + (Conductor.currentTimeChange?.bpm ?? 0.0);
}
function handlePlayhead():Void