gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent death on time travelling

Browse Source
This commit is contained in:
sector-a
2025-10-06 02:57:41 +08:00
committed by Hundrec
parent 3a44168d8c
commit 8022643b8e
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/play/PlayState.hx
+13 -14
View File
@@ -3090,24 +3090,23 @@ class PlayState extends MusicBeatSubState
if ((FlxG.keys.justPressed.NINE #if FEATURE_TOUCH_CONTROLS || (TouchUtil.justPressed && TouchUtil.overlapsComplex(iconP1)) #end)
&& iconP1 != null) iconP1.toggleOldIcon();
#if FEATURE_DEBUG_FUNCTIONS
// PAGEUP: Skip forward two sections.
// SHIFT+PAGEUP: Skip forward twenty sections.
if (FlxG.keys.justPressed.PAGEUP) changeSection(FlxG.keys.pressed.SHIFT ? 20 : 2);
// PAGEDOWN: Skip backward two section. Doesn't replace notes.
// SHIFT+PAGEDOWN: Skip backward twenty sections.
if (FlxG.keys.justPressed.PAGEDOWN) changeSection(FlxG.keys.pressed.SHIFT ? -20 : -2);
#else
if (isChartingMode)
final isDebug:Bool = #if FEATURE_DEBUG_FUNCTIONS true #else false #end;
if (isChartingMode || isDebug)
{
// PAGEUP: Skip forward two sections.
// SHIFT+PAGEUP: Skip forward twenty sections.
if (FlxG.keys.justPressed.PAGEUP) changeSection(FlxG.keys.pressed.SHIFT ? 20 : 2);
if (FlxG.keys.justPressed.PAGEUP)
{
changeSection(FlxG.keys.pressed.SHIFT ? 20 : 2, true);
}
// PAGEDOWN: Skip backward two section. Doesn't replace notes.
// SHIFT+PAGEDOWN: Skip backward twenty sections.
if (FlxG.keys.justPressed.PAGEDOWN) changeSection(FlxG.keys.pressed.SHIFT ? -20 : -2);
if (FlxG.keys.justPressed.PAGEDOWN)
{
changeSection(FlxG.keys.pressed.SHIFT ? -20 : -2, true);
}
}
#end
}
/**
@@ -3896,7 +3895,7 @@ class PlayState extends MusicBeatSubState
* Accounts for BPM changes, does not prevent death from skipped notes.
* @param sections The number of sections to jump, negative to go backwards.
*/
function changeSection(sections:Int):Void
function changeSection(sections:Int, preventDeath:Bool = false):Void
{
// FlxG.sound.music.pause();
@@ -3913,7 +3912,7 @@ class PlayState extends MusicBeatSubState
handleSkippedNotes();
SongEventRegistry.handleSkippedEvents(songEvents, Conductor.instance.songPosition);
// regenNoteData(FlxG.sound.music.time);
if (FlxG.sound.music != null && FlxG.sound.music.playing && preventDeath) regenNoteData(FlxG.sound.music.time);
Conductor.instance.update(FlxG.sound?.music?.time ?? 0.0);