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

ImportGen2Map: Fix imports of malformed maps.

Browse Source 
Fixes #21126
This commit is contained in:
Jakub Vesely
2023-10-23 19:32:13 +02:00
committed by Gustas
parent d1797a021f
commit 91802e6f10
3 changed files with 54 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.Cnc/UtilityCommands/ImportGen2MapCommand.cs
View File

@@ -421,9 +421,30 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
// Calculate Bounds edge tile coordinates.
// Reduce bottom and right by 1 because map.SetBounds() increases them.
var topLeft = new PPos(left, top);
var bottomRight = new PPos(playableAreaWidth + left - 1, playableAreaHeight + unknownHeightPadding + top - 1);
map.SetBounds(topLeft, bottomRight);
if (map.Height.Max() != 0)
{
// Workaround: Some custom TS maps have invalid boundaries, with no padding area at the bottom
// The boundary needs to be reduced until the projections are valid
bool hasValidBoundaries;
var paddingOffset = 1;
do
{
var bottomRight = new PPos(playableAreaWidth + left - 1, playableAreaHeight + unknownHeightPadding + top - paddingOffset);
map.SetBounds(topLeft, bottomRight);
var (topBound, bottomBound) = map.GetCellSpaceBounds();
hasValidBoundaries = topBound != int.MaxValue && bottomBound != int.MinValue;
paddingOffset++;
}
while (!hasValidBoundaries);
}
else
{
var bottomRight = new PPos(playableAreaWidth + left - 1, playableAreaHeight + unknownHeightPadding + top - 1);
map.SetBounds(topLeft, bottomRight);
}
}
protected virtual bool TryHandleOverlayToActorInner(CPos cell, byte[] overlayPack, CellLayer<int> overlayIndex, byte overlayType, out ActorReference actorReference)