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

Merge pull request #8211 from obrakmann/fix8175_ext-editor-breakage

Browse Source 
Fix legacy editor
This commit is contained in:
Pavel Penev
2015-05-22 17:19:59 +03:00
parent beb1481107 f8774dd575
commit bd7838bdb6
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Editor/Surface.cs
View File

@@ -278,6 +278,15 @@ namespace OpenRA.Editor
var ui = u * ChunkSize + i; var ui = u * ChunkSize + i;
var vj = v * ChunkSize + j; var vj = v * ChunkSize + j;
var uv = new MPos(ui, vj); var uv = new MPos(ui, vj);
if (uv.U >= Map.MapSize.X || uv.V >= Map.MapSize.Y)
{
for (var x = 0; x < TileSetRenderer.TileSize; x++)
for (var y = 0; y < TileSetRenderer.TileSize; y++)
p[(j * TileSetRenderer.TileSize + y) * stride + i * TileSetRenderer.TileSize + x] = 0;
continue;
}
var tr = Map.MapTiles.Value[uv]; var tr = Map.MapTiles.Value[uv];
var tile = TileSetRenderer.Data(tr.Type); var tile = TileSetRenderer.Data(tr.Type);
if (tile == null) if (tile == null)
@@ -391,7 +400,7 @@ namespace OpenRA.Editor
ColorPalette GetPaletteForPlayerInner(string name) ColorPalette GetPaletteForPlayerInner(string name)
{ {
var pr = new MapPlayers(Map.PlayerDefinitions).Players[name]; var pr = new MapPlayers(Map.PlayerDefinitions).Players[name];
var pcpi = Program.Rules.Actors["player"].Traits.Get<PlayerColorPaletteInfo>(); var pcpi = Program.Rules.Actors["world"].Traits.Get<PlayerColorPaletteInfo>();
var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp); var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp);
return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette(); return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette();
} }