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

Fix editor

Browse Source
This commit is contained in:
Paul Chote
2011-02-11 17:28:18 +13:00
parent db770eb997
commit e761ce4998
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Editor/BrushTool.cs
View File

@@ -47,8 +47,7 @@ namespace OpenRA.Editor
new TileReference<ushort, byte> new TileReference<ushort, byte>
{ {
type = Brush.N, type = Brush.N,
index = template.PickAny ? byte.MaxValue : (byte)z, index = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
image = template.PickAny ? (byte)((u + pos.X) % 4 + ((v + pos.Y) % 4) * 4) : (byte)z,
}; };
var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize); var ch = new int2((pos.X + u) / Surface.ChunkSize, (pos.Y + v) / Surface.ChunkSize);
@@ -97,7 +96,7 @@ namespace OpenRA.Editor
for (var x = a.X; x <= b.X; x++) for (var x = a.X; x <= b.X; x++)
{ {
s.Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, image = (byte)0, index = (byte)0 }; s.Map.MapTiles[x, p.Y] = new TileReference<ushort, byte> { type = Brush.N, index = (byte)0 };
if (s.Map.MapTiles[x, p.Y - 1].Equals(replace)) if (s.Map.MapTiles[x, p.Y - 1].Equals(replace))
MaybeEnqueue(x, p.Y - 1); MaybeEnqueue(x, p.Y - 1);
if (s.Map.MapTiles[x, p.Y + 1].Equals(replace)) if (s.Map.MapTiles[x, p.Y + 1].Equals(replace))

3
OpenRA.Editor/ResourceTool.cs
View File

@@ -27,8 +27,7 @@ namespace OpenRA.Editor
= new TileReference<byte, byte> = new TileReference<byte, byte>
{ {
type = (byte)Resource.Info.ResourceType, type = (byte)Resource.Info.ResourceType,
index = (byte)random.Next(Resource.Info.SpriteNames.Length), index = (byte)Resource.Value
image = (byte)Resource.Value
}; };
var ch = new int2((surface.GetBrushLocation().X) / Surface.ChunkSize, var ch = new int2((surface.GetBrushLocation().X) / Surface.ChunkSize,

2
OpenRA.Editor/Surface.cs
View File

@@ -214,7 +214,7 @@ namespace OpenRA.Editor
{ {
var tr = Map.MapTiles[u * ChunkSize + i, v * ChunkSize + j]; var tr = Map.MapTiles[u * ChunkSize + i, v * ChunkSize + j];
var tile = TileSet.Tiles[tr.type]; var tile = TileSet.Tiles[tr.type];
var index = (tr.image < tile.TileBitmapBytes.Count) ? tr.image : (byte)0; var index = (tr.index < tile.TileBitmapBytes.Count) ? tr.index : (byte)0;
var rawImage = tile.TileBitmapBytes[index]; var rawImage = tile.TileBitmapBytes[index];
for (var x = 0; x < TileSet.TileSize; x++) for (var x = 0; x < TileSet.TileSize; x++)
for (var y = 0; y < TileSet.TileSize; y++) for (var y = 0; y < TileSet.TileSize; y++)