AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ninjamuffin99/ld47

Browse Source
This commit is contained in:
Cameron Taylor
2020-12-13 01:10:22 -05:00
parent 6c6df2f5d3 6756c830fe
commit 62446d47c4
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/PlayState.hx
View File

@ -425,11 +425,13 @@ class PlayState extends MusicBeatState
function startSong():Void
{
startingSong = false;
previousFrameTime = FlxG.game.ticks;
lastReportedPlayheadPosition = 0;
startingSong = false;
FlxG.sound.playMusic("assets/music/" + SONG.song + "_Inst" + TitleState.soundExt, 1, false);
if (!paused)
FlxG.sound.playMusic("assets/music/" + SONG.song + "_Inst" + TitleState.soundExt, 1, false);
FlxG.sound.music.onComplete = endSong;
vocals.play();
}
@ -623,7 +625,7 @@ class PlayState extends MusicBeatState
{
if (paused)
{
if (FlxG.sound.music != null)
if (FlxG.sound.music != null && !startingSong)
{
FlxG.sound.music.play();
Conductor.songPosition = FlxG.sound.music.time;
@ -797,7 +799,8 @@ class PlayState extends MusicBeatState
{
switch (totalBeats)
{
case 127:
case 128, 129, 130:
vocals.volume = 0;
// FlxG.sound.music.stop();
// curLevel = 'Fresh';
// FlxG.switchState(new PlayState());