mirror of https://github.com/OpenRCT2/OpenRCT2.git
Integrate loc_68BABC
This commit is contained in:
parent
f54b008ac3
commit
af0d4a0b63
|
@ -1383,7 +1383,18 @@ std::unique_ptr<GameActions::ConstructClearResult> MapCanConstructWithClearAt(
|
||||||
{
|
{
|
||||||
if (tileElement->GetOccupiedQuadrants() & (quarterTile.GetBaseQuarterOccupied()))
|
if (tileElement->GetOccupiedQuadrants() & (quarterTile.GetBaseQuarterOccupied()))
|
||||||
{
|
{
|
||||||
goto loc_68BABC;
|
if (MapLoc68BABCShouldContinue(
|
||||||
|
tileElement, pos, clearFunc, flags, res->Cost, crossingMode, canBuildCrossing))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tileElement != nullptr)
|
||||||
|
{
|
||||||
|
map_obstruction_set_error_text(tileElement, *res);
|
||||||
|
res->Error = GameActions::Status::NoClearance;
|
||||||
|
}
|
||||||
|
return res;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
@ -1484,7 +1495,7 @@ std::unique_ptr<GameActions::ConstructClearResult> MapCanConstructWithClearAt(
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
loc_68BABC:
|
|
||||||
if (MapLoc68BABCShouldContinue(tileElement, pos, clearFunc, flags, res->Cost, crossingMode, canBuildCrossing))
|
if (MapLoc68BABCShouldContinue(tileElement, pos, clearFunc, flags, res->Cost, crossingMode, canBuildCrossing))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
|
|
Loading…
Reference in New Issue