aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-02-25 13:49:46 -0500
committerlempamo <[email protected]>2017-02-25 13:49:46 -0500
commit4d769d43e3282e3576faf0a53cb0736d546b1883 (patch)
treecd43f2b8e9292e8ae486bbe51d1be3bee51ed6b3 /ShiftOS.WinForms
parent9aa549e2b99ce4176ccf6dfee705ea25737d360a (diff)
parented5b6549369d470f8aaafbae7716081448377369 (diff)
downloadshiftos_thereturn-4d769d43e3282e3576faf0a53cb0736d546b1883.tar.gz
shiftos_thereturn-4d769d43e3282e3576faf0a53cb0736d546b1883.tar.bz2
shiftos_thereturn-4d769d43e3282e3576faf0a53cb0736d546b1883.zip
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/ShiftOSAudioProvider.cs4
1 files changed, 2 insertions, 2 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;