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

force master server url update, if old.

Browse Source
This commit is contained in:
Chris Forbes
2010-10-09 08:02:20 +13:00
parent 1feb377d43
commit 465f5d295b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Game.cs
View File

@@ -251,6 +251,12 @@ namespace OpenRA
SupportDir = args.GetValue("SupportDir", defaultSupport); SupportDir = args.GetValue("SupportDir", defaultSupport);
Settings = new Settings(SupportDir + "settings.yaml", args); Settings = new Settings(SupportDir + "settings.yaml", args);
// force master server upgrade -- remove once everyone is switched over.
if (Settings.Server.MasterServer == "http://open-ra.org/master/")
Settings.Server.MasterServer = "http://master.open-ra.org/";
Settings.Save();
Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar; Log.LogPath = SupportDir + "Logs" + Path.DirectorySeparatorChar;
Log.AddChannel("perf", "perf.log"); Log.AddChannel("perf", "perf.log");
Log.AddChannel("debug", "debug.log"); Log.AddChannel("debug", "debug.log");

6
OpenRA.Game/GameRules/Settings.cs
View File

@@ -107,12 +107,12 @@ namespace OpenRA.GameRules
FieldLoader.UnknownFieldAction = (s,f) => FieldLoader.UnknownFieldAction = (s,f) =>
{ {
System.Console.WriteLine( "Ignoring unknown field `{0}` on `{1}`".F( s, f.Name ) ); Console.WriteLine( "Ignoring unknown field `{0}` on `{1}`".F( s, f.Name ) );
}; };
if (File.Exists(SettingsFile)) if (File.Exists(SettingsFile))
{ {
System.Console.WriteLine("Loading settings file {0}",SettingsFile); Console.WriteLine("Loading settings file {0}",SettingsFile);
var yaml = MiniYaml.DictFromFile(SettingsFile); var yaml = MiniYaml.DictFromFile(SettingsFile);
foreach (var kv in Sections) foreach (var kv in Sections)
@@ -124,7 +124,7 @@ namespace OpenRA.GameRules
foreach (var kv in Sections) foreach (var kv in Sections)
foreach (var f in kv.Value.GetType().GetFields()) foreach (var f in kv.Value.GetType().GetFields())
if (args.Contains(kv.Key+"."+f.Name)) if (args.Contains(kv.Key+"."+f.Name))
OpenRA.FileFormats.FieldLoader.LoadField( kv.Value, f.Name, args.GetValue(kv.Key+"."+f.Name, "") ); FieldLoader.LoadField( kv.Value, f.Name, args.GetValue(kv.Key+"."+f.Name, "") );
FieldLoader.UnknownFieldAction = err1; FieldLoader.UnknownFieldAction = err1;
FieldLoader.InvalidValueAction = err2; FieldLoader.InvalidValueAction = err2;