diff --git a/Assets/Fungus/Scripts/GameController.cs b/Assets/Fungus/Scripts/GameController.cs index 119a065e..a6f96271 100644 --- a/Assets/Fungus/Scripts/GameController.cs +++ b/Assets/Fungus/Scripts/GameController.cs @@ -226,14 +226,14 @@ public class GameController : MonoBehaviour } // Plays game music using an audio clip - public void PlayGameMusic(AudioClip audioClip) + public void PlayMusic(AudioClip audioClip) { CommandQueue commandQueue = Game.GetInstance().commandQueue; commandQueue.AddCommand(new PlayMusicCommand(audioClip)); } // Stops playing game music - public void StopGameMusic() + public void StopMusic() { CommandQueue commandQueue = Game.GetInstance().commandQueue; commandQueue.AddCommand(new StopMusicCommand()); diff --git a/Assets/FungusExample/Scripts/AudioRoom.cs b/Assets/FungusExample/Scripts/AudioRoom.cs index f4985a2b..0a34248c 100644 --- a/Assets/FungusExample/Scripts/AudioRoom.cs +++ b/Assets/FungusExample/Scripts/AudioRoom.cs @@ -12,7 +12,7 @@ public class AudioRoom : Room { if (GetFlag("music")) { - AddOption("Stop the music", StopMusic); + AddOption("Stop the music", StopGameMusic); if (GetFlag("quiet") == false) { @@ -21,7 +21,7 @@ public class AudioRoom : Room } else { - AddOption("Play some music", StartMusic); + AddOption("Play some music", StartGameMusic); } AddOption("Play a sound effect", PlaySound); AddOption("Back to menu", MainMenu); @@ -36,17 +36,17 @@ public class AudioRoom : Room } } - void StartMusic() + void StartGameMusic() { - PlayGameMusic(musicClip); + PlayMusic(musicClip); SetMusicVolume(1f); SetFlag("music", true); Call(OnEnter); } - void StopMusic() + void StopGameMusic() { - StopGameMusic(); + StopMusic(); SetFlag("music", false); SetFlag("quiet", false); Call(OnEnter);