diff --git a/OpenRA.FileFormats/Map.cs b/OpenRA.FileFormats/Map.cs index 9a39786521..4fe92cdbd3 100644 --- a/OpenRA.FileFormats/Map.cs +++ b/OpenRA.FileFormats/Map.cs @@ -53,24 +53,22 @@ namespace OpenRA.FileFormats public string TileSuffix { get { return "." + Truncate(Theater, 3); } } - public Map(string Filename) + public Map(string filename) { - IniFile file = new IniFile(FileSystem.Open(Filename)); + IniFile file = new IniFile(FileSystem.Open(filename)); IniSection basic = file.GetSection("Basic"); Title = basic.GetValue("Name", "(null)"); INIFormat = int.Parse(basic.GetValue("NewINIFormat", "0")); IniSection map = file.GetSection("Map"); - Theater = Truncate(map.GetValue("Theater", "DESERT"), 8); + Theater = Truncate(map.GetValue("Theater", "TEMPERAT"), 8); XOffset = int.Parse(map.GetValue("X", "0")); YOffset = int.Parse(map.GetValue("Y", "0")); Width = int.Parse(map.GetValue("Width", "0")); Height = int.Parse(map.GetValue("Height", "0")); - - Log.Write("Map format is {0}",INIFormat); MapSize = (INIFormat == 3) ? 128 : 64; MapTiles = new TileReference[ MapSize, MapSize ]; @@ -87,7 +85,7 @@ namespace OpenRA.FileFormats } else // CNC { - UnpackCncTileData(FileSystem.Open(Filename.Substring(0,Filename.Length-4)+".bin")); + UnpackCncTileData(FileSystem.Open(filename.Substring(0,filename.Length-4)+".bin")); ReadCncTrees(file); } diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index c7f1bad197..9a0a770089 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -101,7 +101,7 @@ namespace OpenRA Timer.Time( "ChromeProv, SeqProv, viewport: {0}" ); skipMakeAnims = true; - foreach (var actorReference in Game.world.Map.Actors) + foreach (var actorReference in world.Map.Actors) world.CreateActor(actorReference.Name, actorReference.Location, world.players.Values.FirstOrDefault(p => p.InternalName == actorReference.Owner) ?? world.players[0]); skipMakeAnims = false; Timer.Time( "map actors: {0}" ); diff --git a/OpenRA.Game/Graphics/SequenceProvider.cs b/OpenRA.Game/Graphics/SequenceProvider.cs index e23153074b..6960468f55 100644 --- a/OpenRA.Game/Graphics/SequenceProvider.cs +++ b/OpenRA.Game/Graphics/SequenceProvider.cs @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Xml; +using System.IO; using OpenRA.FileFormats; namespace OpenRA.Graphics @@ -65,12 +66,14 @@ namespace OpenRA.Graphics static void LoadSequencesForUnit(XmlElement eUnit) { string unitName = eUnit.GetAttribute("name"); - Log.Write("Loading sequence {0}", unitName); - var sequences = eUnit.SelectNodes("./sequence").OfType() - .Select(e => new Sequence(unitName, e)) - .ToDictionary(s => s.Name); - - units.Add(unitName, sequences); + // Log.Write("Loading sequence {0}", unitName); + try { + var sequences = eUnit.SelectNodes("./sequence").OfType() + .Select(e => new Sequence(unitName, e)) + .ToDictionary(s => s.Name); + + units.Add(unitName, sequences); + } catch (FileNotFoundException) {} // Do nothing; we can crash later if we actually wanted art } public static Sequence GetSequence(string unitName, string sequenceName) diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index 504c74e4e1..adb0dbd344 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -18,16 +18,9 @@ Packages: mods/cnc/packages/temperat.mix mods/cnc/packages/winter.mix mods/cnc/packages/desert.mix -# Cannot qualify the RA names because they may live inside a mix +# TODO: Obsolete conquer.mix ~main.mix - redalert.mix - speech.mix - temperat.mix - snow.mix - interior.mix -# general.mix conquer.mix - sounds.mix LegacyRules: mods/cnc/minimal.ini: Minimal rules definitions @@ -47,7 +40,7 @@ Sequences: mods/cnc/sequences-structures.xml: mods/cnc/sequences-vehicles.xml: mods/cnc/sequences-infantry.xml: - mods/cnc/sequences-map.xml: + mods/cnc/sequences-map.xml: Trees etc mods/cnc/sequences.xml: Obsolete; will disappear once done converting Chrome: @@ -56,7 +49,3 @@ Chrome: Assemblies: mods/cnc/OpenRA.Mods.Cnc.dll: Cnc mod traits mods/ra/OpenRA.Mods.RA.dll: Red alert mod traits - -Maps: - scg01ea.ini: GDI Mission 1 - scm01ea.ini: Green Acres diff --git a/mods/cnc/sequences-map.xml b/mods/cnc/sequences-map.xml index afaad26eb6..7c34746e10 100644 --- a/mods/cnc/sequences-map.xml +++ b/mods/cnc/sequences-map.xml @@ -1,6 +1,9 @@  - + + + + diff --git a/mods/cnc/trees.yaml b/mods/cnc/trees.yaml index be37e3b71f..766a6649e9 100644 --- a/mods/cnc/trees.yaml +++ b/mods/cnc/trees.yaml @@ -1,3 +1,9 @@ +SPLIT2: + Inherits: ^Building + RenderBuilding: + Palette: terrain + SeedsOre: + -Selectable: SPLIT3: Inherits: ^Building RenderBuilding: