From f8992991f54c9e4bd283ac8ade797351352ea0e1 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 7 Feb 2016 16:18:55 +0000 Subject: [PATCH] Load the load screen images from the virtual filesystem. --- OpenRA.Mods.Cnc/CncLoadScreen.cs | 2 +- OpenRA.Mods.Common/LoadScreens/LogoStripeLoadScreen.cs | 2 +- OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs | 2 +- mods/d2k/mod.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs index fe98a46924..3c18eae282 100644 --- a/OpenRA.Mods.Cnc/CncLoadScreen.cs +++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs @@ -42,7 +42,7 @@ namespace OpenRA.Mods.Cnc r = Game.Renderer; if (r == null) return; - using (var stream = File.OpenRead(Platform.ResolvePath(loadInfo["Image"]))) + using (var stream = modData.ModFiles.Open(info["Image"])) sheet = new Sheet(SheetType.BGRA, stream); var res = r.Resolution; diff --git a/OpenRA.Mods.Common/LoadScreens/LogoStripeLoadScreen.cs b/OpenRA.Mods.Common/LoadScreens/LogoStripeLoadScreen.cs index 16f8e01dec..d32ba40731 100644 --- a/OpenRA.Mods.Common/LoadScreens/LogoStripeLoadScreen.cs +++ b/OpenRA.Mods.Common/LoadScreens/LogoStripeLoadScreen.cs @@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.LoadScreens if (info.ContainsKey("Image")) { - using (var stream = File.OpenRead(Platform.ResolvePath(info["Image"]))) + using (var stream = modData.ModFiles.Open(info["Image"])) sheet = new Sheet(SheetType.BGRA, stream); logo = new Sprite(sheet, new Rectangle(0, 0, 256, 256), TextureChannel.Alpha); diff --git a/OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs b/OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs index b578c7713d..c1a0ca4ba3 100644 --- a/OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs +++ b/OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.LoadScreens var res = Game.Renderer.Resolution; bounds = new Rectangle(0, 0, res.Width, res.Height); - using (var stream = File.OpenRead(info["Image"])) + using (var stream = modData.ModFiles.Open(info["Image"])) { var sheet = new Sheet(SheetType.BGRA, stream); sprite = new Sprite(sheet, new Rectangle(0, 0, 1024, 480), TextureChannel.Alpha); diff --git a/mods/d2k/mod.yaml b/mods/d2k/mod.yaml index 5c6c7978d2..2eed4948b1 100644 --- a/mods/d2k/mod.yaml +++ b/mods/d2k/mod.yaml @@ -126,7 +126,7 @@ Translations: d2k:languages/english.yaml LoadScreen: LogoStripeLoadScreen - Image: d2k:uibits/loadscreen.png + Image: ./mods/d2k/uibits/loadscreen.png Text: Filling Crates..., Breeding Sandworms..., Fuelling carryalls..., Deploying harvesters..., Preparing 'thopters..., Summoning mentats... ContentInstaller: