Merge branch 'master' into working

Sources/Plasma/Apps/plClient/plClient.cpp

@@ -2313,7 +2313,7 @@ void plClient::IDetectAudioVideoSettings()
 		WriteInt(stream, "Audio.SetChannelVolume Ambience", 1);
 		WriteInt(stream, "Audio.SetChannelVolume NPCVoice", 1);
 		WriteInt(stream, "Audio.EnableVoiceRecording", 1);
-		WriteInt(stream, "Audio.EnableSubtitles", false);
+		WriteInt(stream, "Audio.EnableSubtitles", true);
 		WriteString(stream, "Audio.SetDeviceName", deviceName );
 		stream->Close();
 		delete stream;

Sources/Plasma/PubUtilLib/plAudio/plAudioSystem.cpp

@@ -994,7 +994,7 @@ hsBool			plgAudioSys::fInit = false;
 hsBool			plgAudioSys::fActive = false;
 hsBool			plgAudioSys::fUseHardware = false;
 hsBool			plgAudioSys::fMuted = true;
-bool	        plgAudioSys::fEnableSubtitles = false;
+bool	        plgAudioSys::fEnableSubtitles = true;
 hsBool			plgAudioSys::fDelayedActivate = false;
 hsBool			plgAudioSys::fEnableEAX = false;
 hsWindowHndl	plgAudioSys::fWnd = nil;