This commit is contained in:
KadeDeveloper 2021-08-13 19:44:43 -07:00
parent b2f596f73e
commit 7d5d0912b3

View File

@ -201,7 +201,6 @@ class ChartingState extends MusicBeatState
curRenderedSustains = new FlxTypedGroup<FlxSprite>(); curRenderedSustains = new FlxTypedGroup<FlxSprite>();
FlxG.mouse.visible = true; FlxG.mouse.visible = true;
FlxG.save.bind('funkin', 'ninjamuffin99');
tempBpm = _song.bpm; tempBpm = _song.bpm;
@ -1545,10 +1544,12 @@ class ChartingState extends MusicBeatState
case 'song_bpm': case 'song_bpm':
if (nums.value <= 0) if (nums.value <= 0)
nums.value = 1; nums.value = 1;
tempBpm = Std.int(nums.value); _song.bpm = nums.value;
Conductor.mapBPMChanges(_song);
Conductor.changeBPM(Std.int(nums.value));
if (_song.eventObjects[0].type != "BPM Change")
Application.current.window.alert("i'm crying, first event isn't a bpm change. fuck you");
else
_song.eventObjects[0].value = nums.value;
case 'note_susLength': case 'note_susLength':
if (curSelectedNote == null) if (curSelectedNote == null)
return; return;
@ -1783,12 +1784,16 @@ class ChartingState extends MusicBeatState
if (data != null) if (data != null)
{ {
FlxG.sound.music.time = (data.startTime + ((beats - data.startBeat) / (bpm/60)) ) * 1000; FlxG.sound.music.time = (data.startTime + ((beats - data.startBeat) / (bpm/60)) ) * 1000;
} }
} }
else else
FlxG.sound.music.time -= (FlxG.mouse.wheel * Conductor.stepCrochet * 0.4); FlxG.sound.music.time -= (FlxG.mouse.wheel * Conductor.stepCrochet * 0.4);
if (FlxG.sound.music.time > FlxG.sound.music.length)
FlxG.sound.music.time = FlxG.sound.music.length;
if (!PlayState.isSM) if (!PlayState.isSM)
vocals.time = FlxG.sound.music.time; vocals.time = FlxG.sound.music.time;
} }