From 5da5f16aefbb903468285fb0dc98cc204e7befa4 Mon Sep 17 00:00:00 2001
From: william341 <wwokwilliam@gmail.com>
Date: Wed, 22 Feb 2017 19:12:38 -0700
Subject: [PATCH 1/2] rip warnings

---
 ShiftOS_TheReturn/ShiftOS.Engine.csproj | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/ShiftOS_TheReturn/ShiftOS.Engine.csproj b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
index 735d046..3702b18 100644
--- a/ShiftOS_TheReturn/ShiftOS.Engine.csproj
+++ b/ShiftOS_TheReturn/ShiftOS.Engine.csproj
@@ -92,30 +92,6 @@
     <Reference Include="DynamicLua, Version=1.1.2.0, Culture=neutral, PublicKeyToken=null">
       <HintPath>..\packages\DynamicLua.1.1.2.0\lib\net40-Client\DynamicLua.dll</HintPath>
     </Reference>
-    <Reference Include="IronPython, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.dll</HintPath>
-    </Reference>
-    <Reference Include="IronPython.Modules, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.Modules.dll</HintPath>
-    </Reference>
-    <Reference Include="IronPython.SQLite, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="IronPython.Wpf, Version=2.7.5.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\IronPython.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Dynamic.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.AspNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.AspNet.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Scripting.Metadata, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
-      <HintPath>..\packages\IronPython.2.7.5\lib\Net45\Microsoft.Scripting.Metadata.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AppearanceManager.cs" />

From 68828baafd981c35d3858dedd5c42114eab612c7 Mon Sep 17 00:00:00 2001
From: william341 <wwokwilliam@gmail.com>
Date: Sat, 25 Feb 2017 10:48:11 -0700
Subject: [PATCH 2/2] re-enable music, it works

---
 ShiftOS.WinForms/ShiftOSAudioProvider.cs | 4 ++--
 ShiftOS_TheReturn/AudioManager.cs        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ShiftOS.WinForms/ShiftOSAudioProvider.cs b/ShiftOS.WinForms/ShiftOSAudioProvider.cs
index 43a7e51..27c0e5f 100644
--- a/ShiftOS.WinForms/ShiftOSAudioProvider.cs
+++ b/ShiftOS.WinForms/ShiftOSAudioProvider.cs
@@ -50,9 +50,9 @@ namespace ShiftOS.WinForms
             get
             {
                 if (SaveSystem.CurrentSave == null)
-                    return 0.0f;
+                    return 0.45f;
                 if (TutorialManager.IsInTutorial || SaveSystem.CurrentSave.StoryPosition < 1)
-                    return 0.0f;
+                    return 0.45f;
                 try
                 {
                     return SaveSystem.CurrentSave.Settings.audioVolume;
diff --git a/ShiftOS_TheReturn/AudioManager.cs b/ShiftOS_TheReturn/AudioManager.cs
index 5816aca..a548cf6 100644
--- a/ShiftOS_TheReturn/AudioManager.cs
+++ b/ShiftOS_TheReturn/AudioManager.cs
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#define NOSOUND
+//#define NOSOUND
 
 using System;
 using System.Collections.Generic;