From e6b28c2a002d0ba81960c2f915185b7bbbc73465 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 18 Mar 2016 20:07:15 +0000 Subject: [PATCH] Remove Map.AssetExists. --- OpenRA.Game/Map/Map.cs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs index 48430c4c2d..7389f3563d 100644 --- a/OpenRA.Game/Map/Map.cs +++ b/OpenRA.Game/Map/Map.cs @@ -161,13 +161,6 @@ namespace OpenRA [FieldLoader.Ignore] public CellRegion AllCells; public List AllEdgeCells { get; private set; } - void AssertExists(string filename) - { - using (var s = Package.GetStream(filename)) - if (s == null) - throw new InvalidOperationException("Required file {0} not present in this map".F(filename)); - } - /// /// Initializes a new map created by the editor or importer. /// The map will not receive a valid UID until after it has been saved and reloaded. @@ -208,8 +201,8 @@ namespace OpenRA this.modData = modData; Package = package; - AssertExists("map.yaml"); - AssertExists("map.bin"); + if (!Package.Contains("map.yaml") || !Package.Contains("map.bin")) + throw new InvalidDataException("Not a valid map\n File: {1}".F(package.Name)); var yaml = new MiniYaml(null, MiniYaml.FromStream(Package.GetStream("map.yaml"), package.Name)); FieldLoader.Load(this, yaml);