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

Allow maps to be saved during initialisation.

Browse Source
This commit is contained in:
Paul Chote
2013-12-08 10:38:35 +13:00
parent 28cf6d36f4
commit f5f6f1e7aa
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Editor/Form1.cs
View File

@@ -393,7 +393,8 @@ namespace OpenRA.Editor
if (DialogResult.OK == nmd.ShowDialog()) if (DialogResult.OK == nmd.ShowDialog())
{ {
var map = Map.FromTileset(nmd.TheaterBox.SelectedItem as string); var tileset = OpenRA.Rules.TileSets[nmd.TheaterBox.SelectedItem as string];
var map = Map.FromTileset(tileset);
map.Resize((int)nmd.MapWidth.Value, (int)nmd.MapHeight.Value); map.Resize((int)nmd.MapWidth.Value, (int)nmd.MapHeight.Value);
map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value, map.ResizeCordon((int)nmd.CordonLeft.Value, (int)nmd.CordonTop.Value,

17
OpenRA.Game/Map.cs
View File

@@ -109,9 +109,9 @@ namespace OpenRA
[FieldLoader.Ignore] public Lazy<TileReference<byte, byte>[,]> MapResources; [FieldLoader.Ignore] public Lazy<TileReference<byte, byte>[,]> MapResources;
[FieldLoader.Ignore] public string[,] CustomTerrain; [FieldLoader.Ignore] public string[,] CustomTerrain;
public static Map FromTileset(string tileset) public static Map FromTileset(TileSet tileset)
{ {
var tile = OpenRA.Rules.TileSets[tileset].Templates.First(); var tile = tileset.Templates.First();
var tileRef = new TileReference<ushort, byte> { Type = tile.Key, Index = (byte)0 }; var tileRef = new TileReference<ushort, byte> { Type = tile.Key, Index = (byte)0 };
Map map = new Map() Map map = new Map()
@@ -120,7 +120,7 @@ namespace OpenRA
Description = "Describe your map here", Description = "Describe your map here",
Author = "Your name here", Author = "Your name here",
MapSize = new int2(1, 1), MapSize = new int2(1, 1),
Tileset = tileset, Tileset = tileset.Id,
MapResources = Lazy.New(() => new TileReference<byte, byte>[1, 1]), MapResources = Lazy.New(() => new TileReference<byte, byte>[1, 1]),
MapTiles = Lazy.New(() => new TileReference<ushort, byte>[1, 1] { { tileRef } }), MapTiles = Lazy.New(() => new TileReference<ushort, byte>[1, 1] { { tileRef } }),
Actors = Lazy.New(() => new Dictionary<string, ActorReference>()), Actors = Lazy.New(() => new Dictionary<string, ActorReference>()),
@@ -149,7 +149,6 @@ namespace OpenRA
var yaml = new MiniYaml(null, MiniYaml.FromStream(Container.GetContent("map.yaml"))); var yaml = new MiniYaml(null, MiniYaml.FromStream(Container.GetContent("map.yaml")));
FieldLoader.Load(this, yaml); FieldLoader.Load(this, yaml);
Uid = ComputeHash();
// Support for formats 1-3 dropped 2011-02-11. // Support for formats 1-3 dropped 2011-02-11.
// Use release-20110207 to convert older maps to format 4 // Use release-20110207 to convert older maps to format 4
@@ -198,6 +197,8 @@ namespace OpenRA
MapTiles = Lazy.New(() => LoadMapTiles()); MapTiles = Lazy.New(() => LoadMapTiles());
MapResources = Lazy.New(() => LoadResourceTiles()); MapResources = Lazy.New(() => LoadResourceTiles());
Uid = ComputeHash();
} }
public int2[] GetSpawnPoints() public int2[] GetSpawnPoints()
@@ -343,18 +344,12 @@ namespace OpenRA
writer.Write((ushort)MapSize.X); writer.Write((ushort)MapSize.X);
writer.Write((ushort)MapSize.Y); writer.Write((ushort)MapSize.Y);
if (!OpenRA.Rules.TileSets.ContainsKey(Tileset))
throw new InvalidOperationException(
"Tileset used by the map ({0}) does not exist in this mod. Valid tilesets are: {1}"
.F(Tileset, OpenRA.Rules.TileSets.Keys.JoinWith(",")));
// Tile data // Tile data
for (var i = 0; i < MapSize.X; i++) for (var i = 0; i < MapSize.X; i++)
for (var j = 0; j < MapSize.Y; j++) for (var j = 0; j < MapSize.Y; j++)
{ {
writer.Write(MapTiles.Value[i, j].Type); writer.Write(MapTiles.Value[i, j].Type);
var pickAny = OpenRA.Rules.TileSets[Tileset].Templates[MapTiles.Value[i, j].Type].PickAny; writer.Write(MapTiles.Value[i, j].Index);
writer.Write(pickAny ? (byte)(i % 4 + (j % 4) * 4) : MapTiles.Value[i, j].Index);
} }
// Resource data // Resource data

4
OpenRA.Game/ModData.cs
View File

@@ -60,8 +60,6 @@ namespace OpenRA
LoadScreen.Display(); LoadScreen.Display();
WidgetLoader = new WidgetLoader(this); WidgetLoader = new WidgetLoader(this);
AvailableMaps = FindMaps();
// HACK: Mount only local folders so we have a half-working environment for the asset installer // HACK: Mount only local folders so we have a half-working environment for the asset installer
FileSystem.UnmountAll(); FileSystem.UnmountAll();
foreach (var dir in Manifest.Folders) foreach (var dir in Manifest.Folders)
@@ -78,6 +76,8 @@ namespace OpenRA
SpriteLoader = new SpriteLoader(new string[0], SheetBuilder); SpriteLoader = new SpriteLoader(new string[0], SheetBuilder);
VoxelLoader = new VoxelLoader(); VoxelLoader = new VoxelLoader();
CursorProvider.Initialize(Manifest.Cursors); CursorProvider.Initialize(Manifest.Cursors);
AvailableMaps = FindMaps();
} }
public IEnumerable<string> Languages { get; private set; } public IEnumerable<string> Languages { get; private set; }