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

Merge pull request #475 from FunkinCrew/bugfix/weekend-1-bug-fixes

Browse source 
Bugfix/weekend 1 bug fixes
This commit is contained in:
Cameron Taylor 2024-04-19 13:55:34 -04:00 committed by GitHub
parent bb7b863272 93ae7692c8
commit cdc0c18531
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit f3d6cf30dee60a237a6773d8140bd1661f62bd4e Subproject commit 837a8639bd7abe4aa8786dc3790e8d4576f04f28

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

@ -834,9 +834,12 @@ class PlayState extends MusicBeatSubState
inputSpitter = []; inputSpitter = [];
// Reset music properly. // Reset music properly.
if (FlxG.sound.music != null)
{
FlxG.sound.music.time = startTimestamp - Conductor.instance.instrumentalOffset; FlxG.sound.music.time = startTimestamp - Conductor.instance.instrumentalOffset;
FlxG.sound.music.pitch = playbackRate; FlxG.sound.music.pitch = playbackRate;
FlxG.sound.music.pause(); FlxG.sound.music.pause();
}
if (!overrideMusic) if (!overrideMusic)
{ {
@ -852,7 +855,7 @@ class PlayState extends MusicBeatSubState
vocals.pause(); vocals.pause();
vocals.time = 0; vocals.time = 0;
FlxG.sound.music.volume = 1; if (FlxG.sound.music != null) FlxG.sound.music.volume = 1;
vocals.volume = 1; vocals.volume = 1;
vocals.playerVolume = 1; vocals.playerVolume = 1;
vocals.opponentVolume = 1; vocals.opponentVolume = 1;
@ -1548,10 +1551,11 @@ class PlayState extends MusicBeatSubState
function loadStage(id:String):Void function loadStage(id:String):Void
{ {
currentStage = StageRegistry.instance.fetchEntry(id); currentStage = StageRegistry.instance.fetchEntry(id);
currentStage.revive(); // Stages are killed and props destroyed when the PlayState is destroyed to save memory.
if (currentStage != null) if (currentStage != null)
{ {
currentStage.revive(); // Stages are killed and props destroyed when the PlayState is destroyed to save memory.
// Actually create and position the sprites. // Actually create and position the sprites.
var event:ScriptEvent = new ScriptEvent(CREATE, false); var event:ScriptEvent = new ScriptEvent(CREATE, false);
ScriptEventDispatcher.callEvent(currentStage, event); ScriptEventDispatcher.callEvent(currentStage, event);

1
source/funkin/play/character/AnimateAtlasCharacter.hx
View file

@ -192,6 +192,7 @@ class AnimateAtlasCharacter extends BaseCharacter
if (!this.mainSprite.hasAnimation(prefix)) if (!this.mainSprite.hasAnimation(prefix))
{ {
FlxG.log.warn('[ATLASCHAR] Animation ${prefix} not found in Animate Atlas ${_data.assetPath}'); FlxG.log.warn('[ATLASCHAR] Animation ${prefix} not found in Animate Atlas ${_data.assetPath}');
trace('[ATLASCHAR] Animation ${prefix} not found in Animate Atlas ${_data.assetPath}');
continue; continue;
} }
animations.set(anim.name, anim); animations.set(anim.name, anim);