mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Integrate loc_68B9B7

This commit is contained in:
Gymnasiast 2021-07-19 15:01:00 +02:00
parent 95fa0e34e0
commit 41e564d16c
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/world/Map.cpp
View File

@ -1361,22 +1361,26 @@ std::unique_ptr<GameActions::ConstructClearResult> MapCanConstructWithClearAt(
res->GroundFlags |= ELEMENT_IS_UNDERWATER; res->GroundFlags |= ELEMENT_IS_UNDERWATER;
if (water_height < pos.clearanceZ) if (water_height < pos.clearanceZ)
{ {
bool returnError = true;
if (clearFunc != nullptr) if (clearFunc != nullptr)
{ {
if (!clearFunc(&tileElement, pos, flags, &res->Cost)) if (!clearFunc(&tileElement, pos, flags, &res->Cost))
{ {
goto loc_68B9B7; returnError = false;
} }
} }
if (tileElement != nullptr) if (returnError)
{ {
res->Error = GameActions::Status::NoClearance; if (tileElement != nullptr)
res->ErrorMessage = STR_CANNOT_BUILD_PARTLY_ABOVE_AND_PARTLY_BELOW_WATER; {
res->Error = GameActions::Status::NoClearance;
res->ErrorMessage = STR_CANNOT_BUILD_PARTLY_ABOVE_AND_PARTLY_BELOW_WATER;
}
return res;
} }
return res;
} }
} }
loc_68B9B7:
if (gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION && !isTree) if (gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION && !isTree)
{ {
auto heightFromGround = pos.clearanceZ - tileElement->GetBaseZ(); auto heightFromGround = pos.clearanceZ - tileElement->GetBaseZ();