Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-23 08:07:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix some issues with Weekend 1.

Browse source
This commit is contained in:
EliteMasterEric 2024-03-26 23:24:59 -04:00
parent 99ea7bbe84
commit 6b35898ed9
5 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 5f1726f1b0c11fc747b7473708cf4e5f28be05f1 Subproject commit 0a2b524a8dd1d94909e2f078dbdcb191e1b55b8c

18
source/funkin/audio/FunkinSound.hx
View file

@ -1,17 +1,18 @@
package funkin.audio; package funkin.audio;
import flixel.sound.FlxSound;
import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.util.FlxSignal.FlxTypedSignal; import flixel.math.FlxMath;
import flixel.sound.FlxSound;
import flixel.system.FlxAssets.FlxSoundAsset; import flixel.system.FlxAssets.FlxSoundAsset;
import funkin.util.tools.ICloneable; import flixel.tweens.FlxTween;
import flixel.util.FlxSignal.FlxTypedSignal;
import funkin.audio.waveform.WaveformData;
import funkin.audio.waveform.WaveformDataParser;
import funkin.data.song.SongData.SongMusicData; import funkin.data.song.SongData.SongMusicData;
import funkin.data.song.SongRegistry; import funkin.data.song.SongRegistry;
import funkin.audio.waveform.WaveformData; import funkin.util.tools.ICloneable;
import openfl.media.SoundMixer;
import funkin.audio.waveform.WaveformDataParser;
import flixel.math.FlxMath;
import openfl.Assets; import openfl.Assets;
import openfl.media.SoundMixer;
#if (openfl >= "8.0.0") #if (openfl >= "8.0.0")
import openfl.utils.AssetType; import openfl.utils.AssetType;
#end #end
@ -325,6 +326,7 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
if (FlxG.sound.music != null) if (FlxG.sound.music != null)
{ {
FlxG.sound.music.fadeTween?.cancel();
FlxG.sound.music.stop(); FlxG.sound.music.stop();
FlxG.sound.music.kill(); FlxG.sound.music.kill();
} }
@ -401,6 +403,8 @@ class FunkinSound extends FlxSound implements ICloneable<FunkinSound>
{ {
// trace('[FunkinSound] Destroying sound "${this._label}"'); // trace('[FunkinSound] Destroying sound "${this._label}"');
super.destroy(); super.destroy();
FlxTween.cancelTweensOf(this);
this._label = 'unknown';
} }
/** /**

9
source/funkin/audio/SoundGroup.hx
View file

@ -152,9 +152,12 @@ class SoundGroup extends FlxTypedGroup<FunkinSound>
*/ */
public function stop() public function stop()
{ {
forEachAlive(function(sound:FunkinSound) { if (members != null)
sound.stop(); {
}); forEachAlive(function(sound:FunkinSound) {
sound.stop();
});
}
} }
public override function destroy() public override function destroy()

2
source/funkin/audio/VoicesGroup.hx
View file

@ -160,7 +160,9 @@ class VoicesGroup extends SoundGroup
public override function destroy():Void public override function destroy():Void
{ {
playerVoices.destroy(); playerVoices.destroy();
playerVoices = null;
opponentVoices.destroy(); opponentVoices.destroy();
opponentVoices = null;
super.destroy(); super.destroy();
} }
} }

8
source/funkin/play/PlayState.hx
View file

@ -1925,14 +1925,14 @@ class PlayState extends MusicBeatSubState
FlxG.sound.music.play(true, startTimestamp - Conductor.instance.instrumentalOffset); FlxG.sound.music.play(true, startTimestamp - Conductor.instance.instrumentalOffset);
FlxG.sound.music.pitch = playbackRate; FlxG.sound.music.pitch = playbackRate;
// I am going insane. // Prevent the volume from being wrong.
FlxG.sound.music.volume = 1.0; FlxG.sound.music.volume = 1.0;
FlxG.sound.music.fadeTween?.cancel(); FlxG.sound.music.fadeTween?.cancel();
trace('Playing vocals...'); trace('Playing vocals...');
add(vocals); add(vocals);
vocals.play(); vocals.play();
vocals.volume = 1.0;
vocals.pitch = playbackRate; vocals.pitch = playbackRate;
resyncVocals(); resyncVocals();
@ -2927,6 +2927,9 @@ class PlayState extends MusicBeatSubState
// If the camera is being tweened, stop it. // If the camera is being tweened, stop it.
cancelAllCameraTweens(); cancelAllCameraTweens();
// Dispatch the destroy event.
dispatchEvent(new ScriptEvent(DESTROY, false));
if (currentConversation != null) if (currentConversation != null)
{ {
remove(currentConversation); remove(currentConversation);
@ -2970,7 +2973,6 @@ class PlayState extends MusicBeatSubState
{ {
remove(currentStage); remove(currentStage);
currentStage.kill(); currentStage.kill();
dispatchEvent(new ScriptEvent(DESTROY, false));
currentStage = null; currentStage = null;
} }