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

fallback to defaults when something goes wrong

Browse Source
This commit is contained in:
Matthias Mailänder
2013-10-31 21:24:28 +01:00
parent bfcef9df45
commit eed38b3da4
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OpenRA.Game/Game.cs
View File

@@ -285,6 +285,7 @@ namespace OpenRA
Log.AddChannel("sync", "syncreport.log"); Log.AddChannel("sync", "syncreport.log");
Log.AddChannel("server", "server.log"); Log.AddChannel("server", "server.log");
Log.AddChannel("sound", "sound.log"); Log.AddChannel("sound", "sound.log");
Log.AddChannel("graphics", "graphics.log");
if (Settings.Server.DiscoverNatDevices) if (Settings.Server.DiscoverNatDevices)
UPnP.TryNatDiscovery(); UPnP.TryNatDiscovery();
@@ -295,14 +296,34 @@ namespace OpenRA
} }
FileSystem.Mount("."); // Needed to access shaders FileSystem.Mount("."); // Needed to access shaders
Renderer.Initialize( Game.Settings.Graphics.Mode ); try
{
Renderer.Initialize(Game.Settings.Graphics.Mode);
}
catch (Exception e)
{
Log.Write("graphics", "{0}", e);
Console.WriteLine("Renderer initialization failed. Fallback in place. Check graphics.log for details.");
Settings.Graphics.Renderer = new GraphicSettings().Renderer;
Renderer.Initialize(Settings.Graphics.Mode);
}
Renderer = new Renderer(); Renderer = new Renderer();
try
{
Sound.Create(Settings.Sound.Engine);
}
catch (Exception e)
{
Log.Write("sound", "{0}", e);
Console.WriteLine("Creating the sound engine failed. Fallback in place. Check sound.log for details.");
Settings.Sound.Engine = "Null";
Sound.Create(Settings.Sound.Engine);
}
Console.WriteLine("Available mods:"); Console.WriteLine("Available mods:");
foreach(var mod in Mod.AllMods) foreach(var mod in Mod.AllMods)
Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version); Console.WriteLine("\t{0}: {1} ({2})", mod.Key, mod.Value.Title, mod.Value.Version);
Sound.Create(Settings.Sound.Engine);
InitializeWithMods(Settings.Game.Mods); InitializeWithMods(Settings.Game.Mods);
if (Settings.Server.DiscoverNatDevices) if (Settings.Server.DiscoverNatDevices)

2
OpenRA.Game/Graphics/Renderer.cs
View File

@@ -138,7 +138,7 @@ namespace OpenRA.Graphics
var resolution = GetResolution(windowMode); var resolution = GetResolution(windowMode);
string renderer = Game.Settings.Server.Dedicated ? "Null" : Game.Settings.Graphics.Renderer; var renderer = Game.Settings.Server.Dedicated ? "Null" : Game.Settings.Graphics.Renderer;
var rendererPath = Path.GetFullPath("OpenRA.Renderer.{0}.dll".F(renderer)); var rendererPath = Path.GetFullPath("OpenRA.Renderer.{0}.dll".F(renderer));
device = CreateDevice(Assembly.LoadFile(rendererPath), resolution.Width, resolution.Height, windowMode); device = CreateDevice(Assembly.LoadFile(rendererPath), resolution.Width, resolution.Height, windowMode);

1
OpenRA.Renderer.SdlCommon/ErrorHandler.cs
View File

@@ -48,7 +48,6 @@ namespace OpenRA.Renderer.SdlCommon
public static void WriteGraphicsLog(string message) public static void WriteGraphicsLog(string message)
{ {
Log.AddChannel("graphics", "graphics.log");
Log.Write("graphics", message); Log.Write("graphics", message);
Log.Write("graphics", ""); Log.Write("graphics", "");
Log.Write("graphics", "OpenGL Information:"); Log.Write("graphics", "OpenGL Information:");