From 68828baafd981c35d3858dedd5c42114eab612c7 Mon Sep 17 00:00:00 2001 From: william341 Date: Sat, 25 Feb 2017 10:48:11 -0700 Subject: [PATCH] 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;