From b35491d60905b7e60d7f851126121504511940ac Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Thu, 21 May 2015 21:29:59 +0200 Subject: [PATCH 1/2] Fixed reading past the bounds of the map when rendering in the legacy editor --- OpenRA.Editor/Surface.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenRA.Editor/Surface.cs b/OpenRA.Editor/Surface.cs index 3def5aa7a9..d8ff65afdc 100644 --- a/OpenRA.Editor/Surface.cs +++ b/OpenRA.Editor/Surface.cs @@ -278,6 +278,15 @@ namespace OpenRA.Editor var ui = u * ChunkSize + i; var vj = v * ChunkSize + j; 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 tile = TileSetRenderer.Data(tr.Type); if (tile == null) From f8774dd5758f014e4e93fed6abb4b8f616d507b0 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Thu, 21 May 2015 21:30:35 +0200 Subject: [PATCH 2/2] Adjust legacy editor after moving player palettes to the World actor --- OpenRA.Editor/Surface.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Editor/Surface.cs b/OpenRA.Editor/Surface.cs index d8ff65afdc..8738ffeafc 100644 --- a/OpenRA.Editor/Surface.cs +++ b/OpenRA.Editor/Surface.cs @@ -400,7 +400,7 @@ namespace OpenRA.Editor ColorPalette GetPaletteForPlayerInner(string name) { var pr = new MapPlayers(Map.PlayerDefinitions).Players[name]; - var pcpi = Program.Rules.Actors["player"].Traits.Get(); + var pcpi = Program.Rules.Actors["world"].Traits.Get(); var remap = new PlayerColorRemap(pcpi.RemapIndex, pr.Color, pcpi.Ramp); return new ImmutablePalette(PlayerPalette, remap).AsSystemPalette(); }