sound fix

TSKsmiley · Apr 24, 2021 · 0f2f58f · 0f2f58f
1 parent cad3c66
commit 0f2f58f
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 18 deletions.
diff --git a/.idea/.idea.RedDead2D/.idea/contentModel.xml b/.idea/.idea.RedDead2D/.idea/contentModel.xml
diff --git a/.idea/.idea.RedDead2D/.idea/modules.xml b/.idea/.idea.RedDead2D/.idea/modules.xml
diff --git a/Assets/Scenes/Game World.unity b/Assets/Scenes/Game World.unity
@@ -406,7 +406,7 @@ MonoBehaviour:
     spatialBlend: 0
     source: {fileID: 0}
     loop: 1
-  - name: '-----'
+  - name: -----
     clip: {fileID: 0}
     volume: 0.16
     pitch: 1
@@ -462,6 +462,13 @@ MonoBehaviour:
     spatialBlend: 0
     source: {fileID: 0}
     loop: 0
+  - name: walk
+    clip: {fileID: 8300000, guid: 6fd071f799faa024c99fec59c2781c76, type: 3}
+    volume: 0.3
+    pitch: 1
+    spatialBlend: 0
+    source: {fileID: 0}
+    loop: 1
 --- !u!4 &7859229
 Transform:
   m_ObjectHideFlags: 0
@@ -3212,7 +3219,7 @@ GameObject:
   m_Component:
   - component: {fileID: 120438634}
   m_Layer: 0
-  m_Name: '----- Trees --------'
+  m_Name: ----- Trees --------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -116259,7 +116266,7 @@ GameObject:
   m_Component:
   - component: {fileID: 221588026}
   m_Layer: 0
-  m_Name: '----- Rooms -----'
+  m_Name: ----- Rooms -----
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -117381,7 +117388,7 @@ GameObject:
   m_Component:
   - component: {fileID: 270767629}
   m_Layer: 0
-  m_Name: '----- Rocks ------'
+  m_Name: ----- Rocks ------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -118800,7 +118807,7 @@ GameObject:
   m_Component:
   - component: {fileID: 352118942}
   m_Layer: 0
-  m_Name: '----WORLD THINGS----'
+  m_Name: ----WORLD THINGS----
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -254656,7 +254663,7 @@ GameObject:
   m_Component:
   - component: {fileID: 879038058}
   m_Layer: 0
-  m_Name: '----- Trees --------'
+  m_Name: ----- Trees --------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -255918,7 +255925,7 @@ GameObject:
   m_Component:
   - component: {fileID: 984956568}
   m_Layer: 0
-  m_Name: '----- Buildings -----'
+  m_Name: ----- Buildings -----
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -583047,7 +583054,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1360240052}
   m_Layer: 0
-  m_Name: '----- Folliage ------'
+  m_Name: ----- Folliage ------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -802085,7 +802092,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1905429541}
   m_Layer: 0
-  m_Name: '----- Folliage ------'
+  m_Name: ----- Folliage ------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -802279,7 +802286,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1909584739}
   m_Layer: 0
-  m_Name: '----- Rocks ------'
+  m_Name: ----- Rocks ------
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -802818,7 +802825,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1935850536}
   m_Layer: 0
-  m_Name: '----- Buildings -----'
+  m_Name: ----- Buildings -----
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

diff --git a/Assets/Scriptable Objects/Quests/05Quest.meta b/Assets/Scriptable Objects/Quests/05Quest.meta
diff --git a/Assets/Scriptable Objects/Quests/06Quest.meta b/Assets/Scriptable Objects/Quests/06Quest.meta
diff --git a/Assets/Scripts/Audio/AudioManager.cs b/Assets/Scripts/Audio/AudioManager.cs
@@ -41,20 +41,20 @@ public AudioSource GetSound(string name)
     {
         Sound s = FindSound(name);
 
-        return s.source;
+        return s?.source;
     }
 
     public void Play(string name)
     {
         Sound s = FindSound(name);
 
-        s.source.Play();
+        s?.source.Play();
     }
 
     public void Stop(string name) {
         Sound s = FindSound(name);
 
-        s.source.Stop();
+        s?.source.Stop();
     }
 
     private Sound FindSound(string _name)
@@ -64,6 +64,7 @@ private Sound FindSound(string _name)
         if (s == null)
         {
             Debug.LogWarning("Sound " + name + " not found");
+            return null;
         }
 
         return s;