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

Merge pull request #21925 from Gymnasiast/fix/10701 

Fix two error messages when placing wall
This commit is contained in:
Michael Steenbeek 2024-04-28 23:06:39 +02:00 committed by GitHub
parent c02c7925c3 de0ca4ded4
commit 5470a49382
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -8,6 +8,7 @@
- Change: [#21715] [Plugin] Remove access to the internal `owner` property. Note: `ownership` is still accessible.
- Change: [#21855] Cheats menu dropdown no longer requires dragging.
- Fix: [#866] Boat Hire boats get stuck entering track.
- Fix: [#10701] No reason specified when placing door over unsuitable track.
- Fix: [#19559] Custom rides with long descriptions extend into lower widgets.
- Fix: [#21696] Fullscreen window option not correctly applied on macOS.
- Fix: [#21787] Map generator heightmap should respect increased height limits.

3
src/openrct2/actions/WallPlaceAction.cpp
View File

@ -102,7 +102,7 @@ GameActions::Result WallPlaceAction::Query() const
else if (!_trackDesignDrawingPreview && (_loc.x > mapSizeMax.x || _loc.y > mapSizeMax.y))
{
LOG_ERROR("Invalid x/y coordinates. x = %d y = %d", _loc.x, _loc.y);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_BUILD_THIS_HERE, STR_NONE);
return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_BUILD_THIS_HERE, STR_OFF_EDGE_OF_MAP);
}
if (_edge > 3)
@ -585,6 +585,7 @@ GameActions::Result WallPlaceAction::WallCheckObstruction(
case TileElementType::Track:
if (!WallCheckObstructionWithTrack(wall, z0, tileElement->AsTrack(), wallAcrossTrack))
{
MapGetObstructionErrorText(tileElement, res);
return res;
}
break;