epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9150 from penev92/bleed_dedicatedSound

Browse Source 
Make lower-level Sound not require the server state directly
This commit is contained in:
Matthias Mailänder
2015-08-24 06:44:51 +02:00
parent 02dd5afbd9 49e9ad2c7c
commit 6132ec6558
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -275,7 +275,7 @@ namespace OpenRA
Settings.Game.Mod = mod; Settings.Game.Mod = mod;
Sound.StopVideo(); Sound.StopVideo();
Sound.Initialize(Settings.Sound, Settings.Server); Sound.Initialize(Settings.Server.Dedicated ? "Null" : Settings.Sound.Engine);
ModData = new ModData(mod, !Settings.Server.Dedicated); ModData = new ModData(mod, !Settings.Server.Dedicated);
ModData.InitializeLoaders(); ModData.InitializeLoaders();

3
OpenRA.Game/Sound/Sound.cs
View File

@@ -66,9 +66,8 @@ namespace OpenRA
return soundEngine.AddSoundSourceFromMemory(rawData, channels, sampleBits, sampleRate); return soundEngine.AddSoundSourceFromMemory(rawData, channels, sampleBits, sampleRate);
} }
public static void Initialize(SoundSettings soundSettings, ServerSettings serverSettings) public static void Initialize(string engineName)
{ {
var engineName = serverSettings.Dedicated ? "Null" : soundSettings.Engine;
var enginePath = Platform.ResolvePath(".", "OpenRA.Platforms." + engineName + ".dll"); var enginePath = Platform.ResolvePath(".", "OpenRA.Platforms." + engineName + ".dll");
soundEngine = CreateDevice(Assembly.LoadFile(enginePath)); soundEngine = CreateDevice(Assembly.LoadFile(enginePath));