Add main music

cs3217-2324 · Apr 3, 2024 · 9d5a59f · 9d5a59f
1 parent 687fd8e
commit 9d5a59f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/TowerForge/TowerForge/Commons/Sounds/AudioManager.swift b/TowerForge/TowerForge/Commons/Sounds/AudioManager.swift
@@ -79,6 +79,7 @@ internal class AudioManager: NSObject, AVAudioPlayerDelegate {
 
     /// Plays background music
     func playMainMusic() {
+        stopBackground()
         if !isMainPlaying {
             mainAudioPlayer?.play()
             isMainPlaying = true
@@ -102,6 +103,7 @@ internal class AudioManager: NSObject, AVAudioPlayerDelegate {
 
     /// Plays background music
     func playBackground() {
+        stopMainMusic()
         if !isBackgroundPlaying {
             backgroundAudioPlayer?.play()
             isBackgroundPlaying = true

diff --git a/TowerForge/TowerForge/ViewControllers/MainMenuViewController.swift b/TowerForge/TowerForge/ViewControllers/MainMenuViewController.swift
@@ -11,6 +11,11 @@ import UIKit
 class MainMenuViewController: UIViewController {
     var selectedGameMode: Mode = .deathMatch
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        AudioManager.shared.playMainMusic()
+    }
+
     @IBAction private func DeathMatch(_ sender: Any) {
         selectedGameMode = .deathMatch
         performSegue(withIdentifier: "segueToGame", sender: self)