80486DX2-66/FNF-i486-Engine
1
0
Fork 0
Code Issues Actions Releases Wiki Activity

oops

Browse Source 
Added compatibility with alt anim-specific notes (by SNIFF charts)
Restarting the song or exiting to Freeplay now closes FFmpeg (if it's already running)
This commit is contained in:
JordanSantiagoYT
2024-03-22 00:11:02 -04:00
parent 5cd0fc3ab8
commit ab87fdda7d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/FreeplayState.hx
View File

@@ -70,6 +70,8 @@ class FreeplayState extends MusicBeatState
Paths.clearStoredMemory();
Paths.clearUnusedMemory();
Paths.gc();
if (PlayState.process != null) PlayState.stopRender();
persistentUpdate = true;
PlayState.isStoryMode = false;

7
source/PlayState.hx
View File

@@ -4025,6 +4025,8 @@ class PlayState extends MusicBeatState
if (swagNote.noteskin.length > 0 && !Paths.noteSkinFramesMap.exists(swagNote.noteskin)) inline Paths.initNote(4, swagNote.noteskin);
if(!Std.isOfType(songNotes[3], String)) swagNote.noteType = ChartingState.noteTypeList[songNotes[3]]; //Backward compatibility + compatibility with Week 7 charts
if(Std.isOfType(songNotes[3], Bool)) swagNote.animSuffix = (songNotes[3] || section.altAnim ? '-alt' : ''); //Compatibility with charts made by SNIFF
if (!noteTypeMap.exists(swagNote.noteType)) {
noteTypeMap.set(swagNote.noteType, true);
@@ -6410,6 +6412,7 @@ if (ClientPrefs.showNPS && (notesHitDateArray.length > 0 || oppNotesHitDateArray
public static function restartSong(noTrans:Bool = true)
{
if (process != null) stopRender();
PlayState.instance.paused = true; // For lua
if (ClientPrefs.songLoading) FlxG.sound.music.volume = 0;
if (ClientPrefs.songLoading) PlayState.instance.vocals.volume = 0;
@@ -9141,7 +9144,7 @@ if (ClientPrefs.showNPS && (notesHitDateArray.length > 0 || oppNotesHitDateArray
// Render mode stuff.. If SGWLC isn't ok with this I will remove it :thumbsup:
private var process:sys.io.Process;
public static var process:sys.io.Process;
var ffmpegExists:Bool = false;
private function initRender():Void
@@ -9171,7 +9174,7 @@ if (ClientPrefs.showNPS && (notesHitDateArray.length > 0 || oppNotesHitDateArray
process.stdin.writeBytes(bytes, 0, bytes.length);
}
public function stopRender():Void
public static function stopRender():Void
{
if (!ClientPrefs.ffmpegMode)
return;

2
source/RenderingDoneSubState.hx
View File

@@ -33,7 +33,7 @@ class RenderingDoneSubState extends MusicBeatSubstate {
override public function create() {
super.create();
PlayState.instance.stopRender();
PlayState.stopRender();
var leDate = Date.now();
if (leDate.getHours() >= 6 && leDate.getHours() <= 18) {