diff options
| author | william341 <[email protected]> | 2017-02-25 10:48:11 -0700 |
|---|---|---|
| committer | william341 <[email protected]> | 2017-02-25 10:48:11 -0700 |
| commit | 68828baafd981c35d3858dedd5c42114eab612c7 (patch) | |
| tree | fceb4319ccc269096504d717d920c50f942e727a | |
| parent | 5da5f16aefbb903468285fb0dc98cc204e7befa4 (diff) | |
| download | shiftos_thereturn-68828baafd981c35d3858dedd5c42114eab612c7.tar.gz shiftos_thereturn-68828baafd981c35d3858dedd5c42114eab612c7.tar.bz2 shiftos_thereturn-68828baafd981c35d3858dedd5c42114eab612c7.zip | |
re-enable music, it works
| -rw-r--r-- | ShiftOS.WinForms/ShiftOSAudioProvider.cs | 4 | ||||
| -rw-r--r-- | 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; |