Skip to content

Commit

Permalink
the rest of the basic stuff to get android working
Browse files Browse the repository at this point in the history
song loading partially works though but android isnt my priority
  • Loading branch information
JordanSantiagoYT committed Oct 16, 2023
1 parent 6d6c0e2 commit 7cef4e6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion source/Paths.hx
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class Paths

inline static public function json(key:String, ?library:String)
{
return getPath('data/$key.json', TEXT, library);
return getPath('data/' + key + '.json', TEXT, library);
}

inline static public function shaderFragment(key:String, ?library:String)
Expand Down
8 changes: 4 additions & 4 deletions source/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ class TitleState extends MusicBeatState
// music.play();

if(FlxG.sound.music == null) {
FlxG.sound.playMusic(SUtil.getPath() + Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
FlxG.sound.playMusic(Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
}
}

Expand Down Expand Up @@ -646,7 +646,7 @@ class TitleState extends MusicBeatState
{
case 1:
//FlxG.sound.music.stop();
FlxG.sound.playMusic(SUtil.getPath() + Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
FlxG.sound.playMusic(Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
FlxG.sound.music.fadeIn(4, 0, 0.7);
case 2:
#if PSYCH_WATERMARKS
Expand Down Expand Up @@ -756,7 +756,7 @@ class TitleState extends MusicBeatState
skippedIntro = true;
playJingle = false;

FlxG.sound.playMusic(SUtil.getPath() + Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
FlxG.sound.playMusic(Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
FlxG.sound.music.fadeIn(4, 0, 0.7);
return;
}
Expand All @@ -778,7 +778,7 @@ class TitleState extends MusicBeatState
remove(credGroup);
FlxG.camera.flash(FlxColor.WHITE, 3);
sound.onComplete = function() {
FlxG.sound.playMusic(SUtil.getPath() + Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
FlxG.sound.playMusic(Paths.music('freakyMenu-' + ClientPrefs.daMenuMusic), 0);
FlxG.sound.music.fadeIn(4, 0, 0.7);
transitioning = false;
};
Expand Down

0 comments on commit 7cef4e6

Please sign in to comment.