Changed hard coded 'Global.txt' path to variable. Fixed multiple song…

…s bug.
JustPaRcS · Aug 13, 2021 · 41fe26e · 41fe26e
1 parent f51be51
commit 41fe26e
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/PistolWhipModSelector/PistolWhipModSelector/SaveOriginalFiles/ReadAllAudioSongs.cs b/PistolWhipModSelector/PistolWhipModSelector/SaveOriginalFiles/ReadAllAudioSongs.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace PistolWhipModSelector.SaveOriginalFiles
 {
@@ -18,7 +19,23 @@ public ReadAllAudioSongs()
 
         private List<AudioLineProperties> GetAudioLines(bool tryAgain = false)
         {
-            string filePath = GlobalVariables.GameFolderPath + @"\Pistol Whip_Data\StreamingAssets\Audio\GeneratedSoundBanks\Windows\Global.txt";
+            string filePath = "";
+
+            string[] files = Directory.GetFiles(GlobalVariables.GameFolderPath + @"\Pistol Whip_Data\", "Global.txt", SearchOption.AllDirectories);
+            if (files.Length == 1)
+            {
+                filePath = files[0];
+            }
+            else if (files.Length > 1)
+            {
+                MessageBox.Show("Found multiple 'Global.txt' files in 'Pistol Whip_Data'! \nExit program...");
+                Environment.Exit(1);
+            }
+            else
+            {
+                MessageBox.Show("Could not find 'Global.txt' in 'Pistol Whip_Data'! \nExit program...");
+                Environment.Exit(1);
+            }
 
             List<AudioLineProperties> audios = new List<AudioLineProperties>();
 
@@ -31,7 +48,7 @@ private List<AudioLineProperties> GetAudioLines(bool tryAgain = false)
 
                     while ((line = file.ReadLine()) != null)
                     {
-                        if (memoryAudioSectionFound && !String.IsNullOrWhiteSpace(line) && line.Contains("\\Music\\") && !line.Contains("mus_landing_area_lp") && !line.Contains("mus_tutorial") && !line.Contains("visualizer"))
+                        if (memoryAudioSectionFound && !String.IsNullOrWhiteSpace(line) && line.Contains("\\Music\\") && !line.Contains("sfx_") && !line.Contains("\\TestContent\\") && !line.Contains("mus_landing_area_lp") && !line.Contains("mus_tutorial") && !line.Contains("visualizer"))
                         {
                             AudioLineProperties currentAudioLine = this.TrimAudioLines(line);
                             if(!audios.Exists(x=> x.ID == currentAudioLine.ID))