Fixed remaining old Police Scanner paths

Albo1125 · Feb 25, 2019 · b3892dd · b3892dd
1 parent 8b4b989
commit b3892dd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/AssortedCallouts/Assorted Callouts.ini b/AssortedCallouts/Assorted Callouts.ini
@@ -17,7 +17,7 @@ OtherUnitTakingCallAudio=true
 //Division can be set to any number from 1 to 10 inclusive. Default=1
 Division=1
 
-//UnitType can be set to any of the file names in the following folder: Grand Theft Auto V/LSPDFR/Police Scanner/Assorted Callouts Audio/UNIT_TYPE. Default=LINCOLN
+//UnitType can be set to any of the file names in the following folder: Grand Theft Auto V/LSPDFR/audio/scanner/Assorted Callouts Audio/UNIT_TYPE. Default=LINCOLN
 UnitType=LINCOLN
 
 //Beat can be set to any number from 1 to 24 inclusive. Default=18

diff --git a/AssortedCallouts/Callouts/BankHeist.cs b/AssortedCallouts/Callouts/BankHeist.cs
@@ -25,7 +25,7 @@ internal class BankHeist : AssortedCallout
 
  private bool fighting = false;
  private bool CalloutRunning = false;
- private System.Media.SoundPlayer AlarmPlayer = new System.Media.SoundPlayer("LSPDFR/Police Scanner/Assorted Callouts Audio/ALARM_BELL.wav");
+ private System.Media.SoundPlayer AlarmPlayer = new System.Media.SoundPlayer("LSPDFR/audio/scanner/Assorted Callouts Audio/ALARM_BELL.wav");
  private bool AudioStateChanged = false;
 
  private bool AlarmPlaying = false;

diff --git a/AssortedCallouts/SpeechHandler.cs b/AssortedCallouts/SpeechHandler.cs
@@ -82,7 +82,7 @@ public static void PlayPhoneCallingSound(int TimesToPlay)
  for (int i = 0; i < TimesToPlay; i++)
  {
  wmp1.settings.volume = 100;
- wmp1.URL = "LSPDFR/Police Scanner/Assorted Callouts Audio/PHONE_CALLING.wav";
+ wmp1.URL = "LSPDFR/audio/scanner/Assorted Callouts Audio/PHONE_CALLING.wav";
  GameFiber.Wait(3000);
  }
  }
@@ -91,7 +91,7 @@ public static void PlayPhoneBusySound(int TimesToPlay)
  for (int i = 0; i < TimesToPlay; i++)
  {
  wmp1.settings.volume = 100;
- wmp1.URL = "LSPDFR/Police Scanner/Assorted Callouts Audio/PHONE_BUSY.wav";
+ wmp1.URL = "LSPDFR/audio/scanner/Assorted Callouts Audio/PHONE_BUSY.wav";
 
  GameFiber.Wait(800);
  }
@@ -136,35 +136,35 @@ public static void HandleBankHeistSpeech(List<string> Lines, string LineFolderMo
  try
  {
  wmp1.controls.stop();
- if (File.Exists("LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav"))
+ if (File.Exists("LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav"))
  {
  wmp1.settings.volume = 100;
- wmp1.URL = "LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav";
+ wmp1.URL = "LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav";
  }
  else
  {
- Game.LogTrivial("Audio File not found at " + "LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav");
+ Game.LogTrivial("Audio File not found at " + "LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav");
  }
  }
- catch (Exception e) { Game.LogTrivial("Audio File not found at " + "LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav"); }
+ catch (Exception e) { Game.LogTrivial("Audio File not found at " + "LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + CptWellsLineAudioCount.ToString() + ".wav"); }
  CptWellsLineAudioCount++;
  }
  else if (PersonTalking == "You")
  {
  try
  {
  wmp1.controls.stop();
- if (File.Exists("LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav"))
+ if (File.Exists("LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav"))
  {
  wmp1.settings.volume = 100;
- wmp1.URL = "LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav";
+ wmp1.URL = "LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav";
  }
  else
  {
- Game.LogTrivial("Audio File not found at " + "LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav");
+ Game.LogTrivial("Audio File not found at " + "LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav");
  }
  }
- catch (Exception e) { Game.LogTrivial("Audio File not found at " + "LSPDFR/Police Scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav"); }
+ catch (Exception e) { Game.LogTrivial("Audio File not found at " + "LSPDFR/audio/scanner/Assorted Callouts Audio/Lines/" + LineFolderModifier + "/" + PersonTalking + "/Line" + YouLineAudioCount.ToString() + ".wav"); }
  YouLineAudioCount++;
 
  }