From c44afc072224198f5298a4d0a0c804d909d43dc4 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 16 Jun 2015 08:16:49 +0100 Subject: [PATCH] Remove viewport editor-mode assumptions. --- OpenRA.Game/Graphics/TerrainRenderer.cs | 4 +++- OpenRA.Game/Graphics/Viewport.cs | 2 +- OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Graphics/TerrainRenderer.cs b/OpenRA.Game/Graphics/TerrainRenderer.cs index a7d62c1f58..1f6a123159 100644 --- a/OpenRA.Game/Graphics/TerrainRenderer.cs +++ b/OpenRA.Game/Graphics/TerrainRenderer.cs @@ -24,7 +24,9 @@ namespace OpenRA.Graphics theater = wr.Theater; mapTiles = world.Map.MapTiles.Value; - terrain = new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha, wr.Palette("terrain"), true); + terrain = new TerrainSpriteLayer(world, wr, theater.Sheet, BlendMode.Alpha, + wr.Palette("terrain"), wr.World.Type != WorldType.Editor); + foreach (var cell in world.Map.AllCells) UpdateCell(cell); diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs index 1b5ab1444f..a155529302 100644 --- a/OpenRA.Game/Graphics/Viewport.cs +++ b/OpenRA.Game/Graphics/Viewport.cs @@ -261,7 +261,7 @@ namespace OpenRA.Graphics { if (cellsDirty) { - cells = CalculateVisibleCells(worldRenderer.World.Type != WorldType.Editor); + cells = CalculateVisibleCells(false); cellsDirty = false; } diff --git a/OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs b/OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs index 2c9a49922e..5f5f2c2e5c 100644 --- a/OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs +++ b/OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs @@ -146,7 +146,7 @@ namespace OpenRA.Mods.Common.Traits Dirty.Clear(); - foreach (var uv in wr.Viewport.VisibleCellsInsideBounds.MapCoords) + foreach (var uv in wr.Viewport.AllVisibleCells.MapCoords) { var t = Tiles[uv]; if (t.Sprite != null)