diff --git a/OpenRA.Game/Manifest.cs b/OpenRA.Game/Manifest.cs index 3ae9e78ff6..1d2ad01433 100644 --- a/OpenRA.Game/Manifest.cs +++ b/OpenRA.Game/Manifest.cs @@ -35,7 +35,6 @@ namespace OpenRA public readonly InstallData ContentInstaller; public readonly Dictionary> Fonts; public readonly Size TileSize = new Size(24, 24); - public readonly string NewsUrl; public readonly TileShape TileShape = TileShape.Rectangle; public Manifest(string mod) @@ -97,9 +96,6 @@ namespace OpenRA compat.Add(c.Trim()); MapCompatibility = compat.ToArray(); - - if (yaml.ContainsKey("NewsUrl")) - NewsUrl = yaml["NewsUrl"].Value; } static string[] YamlList(Dictionary yaml, string key) diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs index ed5bc9d9f9..9878eedbba 100644 --- a/OpenRA.Game/Settings.cs +++ b/OpenRA.Game/Settings.cs @@ -141,6 +141,7 @@ namespace OpenRA public string MapRepository = "http://resource.openra.net/map/"; public bool FetchNews = true; + public string NewsUrl = "http://www.openra.net/gamenews"; public DateTime NewsFetchedDate; } diff --git a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs index 70be5d890e..31085dbde6 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/MainMenuLogic.cs @@ -147,7 +147,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic newsStatus = newsPanel.Get("NEWS_STATUS"); SetNewsStatus("Loading news"); - if (Game.modData.Manifest.NewsUrl != null) + if (Game.Settings.Game.NewsUrl != null) { var cacheFile = GetNewsCacheFile(); var cacheValid = File.Exists(cacheFile) && DateTime.Today.ToUniversalTime() <= Game.Settings.Game.NewsFetchedDate; @@ -155,7 +155,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic if (cacheValid) DisplayNews(ReadNews(File.ReadAllBytes(cacheFile))); else - new Download(Game.modData.Manifest.NewsUrl, e => { }, NewsDownloadComplete); + new Download(Game.Settings.Game.NewsUrl, e => { }, NewsDownloadComplete); } var newsButton = newsBG.GetOrNull("NEWS_BUTTON"); diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index d7f27f1565..b62ceafb47 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -201,5 +201,3 @@ Missions: mods/cnc/missions.yaml SupportsMapsFrom: cnc - -NewsUrl: http://www.openra.net/gamenews diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index e1ef44bebd..e0ede7b273 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -176,5 +176,3 @@ LuaScripts: mods/common/lua/facing.lua SupportsMapsFrom: d2k - -NewsUrl: http://www.openra.net/gamenews \ No newline at end of file diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index f7b62a84f4..6db8254436 100644 --- a/mods/ra/mod.yaml +++ b/mods/ra/mod.yaml @@ -196,5 +196,3 @@ Missions: mods/ra/missions.yaml SupportsMapsFrom: ra - -NewsUrl: http://www.openra.net/gamenews \ No newline at end of file diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index d9a0aa62e1..3c9a66cbcd 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -217,5 +217,3 @@ LuaScripts: mods/common/lua/facing.lua SupportsMapsFrom: ts - -NewsUrl: http://www.openra.net/gamenews