From 7cef4e67d3853e17517e048a55d289acb6f35356 Mon Sep 17 00:00:00 2001
From: JordanSantiagoYT <jordan.doesosu2@gmail.com>
Date: Sun, 15 Oct 2023 20:42:19 -0400
Subject: [PATCH] the rest of the basic stuff to get android working

song loading partially works though but android isnt my priority
---
 source/Paths.hx      | 2 +-
 source/TitleState.hx | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/Paths.hx b/source/Paths.hx
index af4e5d595fa..7d7e6d1cb5c 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -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)
diff --git a/source/TitleState.hx b/source/TitleState.hx
index 979483fabe7..2f668ae8fb1 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -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);
 			}
 		}
 
@@ -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
@@ -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;
 				}
@@ -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;
 					};