Fix 2 regressions (Albeoris#309)

* menu music fix * Fixed mods with spaces in folder name
SamsamTS · Feb 20, 2024 · 394c1ba · 394c1ba
1 parent 4807634
commit 394c1ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Assembly-CSharp/Global/Sound/Lib/SoundLib.cs b/Assembly-CSharp/Global/Sound/Lib/SoundLib.cs
@@ -21,7 +21,10 @@ public static void PlayMovieMusic(String movieName, Int32 offsetTimeMSec = 0)
 		Int32 movieSoundIndex = SoundLib.GetMovieSoundIndex(movieName);
 		if (movieSoundIndex != -1)
 		{
-			SoundLib.MovieAudioPlayer.PlayMusic(movieSoundIndex, offsetTimeMSec, SoundProfileType.MovieAudio);
+			//if (movieName == "FMV000")
+            //    SoundLib.MovieAudioPlayer.PlayMusic(movieSoundIndex, offsetTimeMSec, SoundProfileType.MovieAudio);
+			//else
+            SoundLib.MovieAudioPlayer.PlayMusic(movieSoundIndex, offsetTimeMSec, SoundProfileType.MovieAudio);
 		}
 		else
 		{
@@ -40,7 +43,7 @@ public static Int32 GetMovieSoundIndex(String movieName)
 		if (String.Equals(movieName, "FMV000"))
 		{
 			soundName = "Sounds01/BGM_/music033";
-			return SoundMetaData.GetSoundIndex(soundName, SoundProfileType.Music);
+			//return SoundMetaData.GetSoundIndex(soundName, SoundProfileType.Music);
 		}
 		else if (String.Equals(movieName, "FMV059"))
 		{

diff --git a/Memoria.Launcher/Memoria/MemoriaIniControl.cs b/Memoria.Launcher/Memoria/MemoriaIniControl.cs
@@ -606,8 +606,6 @@ public bool IsOptionPresentInIni(String category, String option)
         public void ComeBackToLauncherFromModManager()
         {
             LoadSettings();
-            //OnPropertyChanged(nameof(OrchestralMusic));
-            //OnPropertyChanged(nameof(HighFpsVideo));
         }
         private void LoadSettings()
         {
@@ -870,7 +868,7 @@ private string UpdateModList()
                 str = "";
             else
             {
-                str = str.Replace(" ", "").Replace("\"", "").Replace("MoguriSoundtrack", "").Replace("MoguriVideo", "");
+                str = str.Replace("\"", "").Replace("MoguriSoundtrack", "").Replace("MoguriVideo", "");
             }
 
             if (Directory.Exists("MoguriSoundtrack") && OrchestralMusic == 1)
@@ -883,6 +881,7 @@ private string UpdateModList()
 
             for (Int32 i = 0; i < modList.Length; i++)
             {
+                modList[i] = modList[i].Trim(' ');
                 if (!String.IsNullOrEmpty(modList[i]))
                 {
                     if (String.IsNullOrEmpty(modList2))