mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix error messages for when map_is_location_owned is false
This commit is contained in:
parent
3016701a98
commit
45c4ed2679
|
@ -93,7 +93,7 @@ GameActions::Result::Ptr RideEntranceExitPlaceAction::Query() const
|
||||||
auto z = ride->stations[_stationNum].GetBaseZ();
|
auto z = ride->stations[_stationNum].GetBaseZ();
|
||||||
if (!LocationValid(_loc) || (!gCheatsSandboxMode && !map_is_location_owned({ _loc, z })))
|
if (!LocationValid(_loc) || (!gCheatsSandboxMode && !map_is_location_owned({ _loc, z })))
|
||||||
{
|
{
|
||||||
return MakeResult(GameActions::Status::NotOwned, errorTitle, STR_NONE);
|
return MakeResult(GameActions::Status::NotOwned, errorTitle, STR_LAND_NOT_OWNED_BY_PARK);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!MapCheckCapacityAndReorganise(_loc))
|
if (!MapCheckCapacityAndReorganise(_loc))
|
||||||
|
@ -224,7 +224,7 @@ GameActions::Result::Ptr RideEntranceExitPlaceAction::TrackPlaceQuery(const Coor
|
||||||
|
|
||||||
if (!gCheatsSandboxMode && !map_is_location_owned(loc))
|
if (!gCheatsSandboxMode && !map_is_location_owned(loc))
|
||||||
{
|
{
|
||||||
return MakeResult(GameActions::Status::NotOwned, errorTitle, STR_NONE);
|
return MakeResult(GameActions::Status::NotOwned, errorTitle, STR_LAND_NOT_OWNED_BY_PARK);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!MapCheckCapacityAndReorganise(loc))
|
if (!MapCheckCapacityAndReorganise(loc))
|
||||||
|
|
|
@ -89,7 +89,7 @@ GameActions::Result::Ptr WallPlaceAction::Query() const
|
||||||
}
|
}
|
||||||
else if (!map_is_location_owned(_loc))
|
else if (!map_is_location_owned(_loc))
|
||||||
{
|
{
|
||||||
return MakeResult(GameActions::Status::NotOwned, STR_CANT_BUILD_THIS_HERE, STR_NONE);
|
return MakeResult(GameActions::Status::NotOwned, STR_CANT_BUILD_THIS_HERE, STR_LAND_NOT_OWNED_BY_PARK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (!_trackDesignDrawingPreview && (_loc.x > GetMapSizeMaxXY() || _loc.y > GetMapSizeMaxXY()))
|
else if (!_trackDesignDrawingPreview && (_loc.x > GetMapSizeMaxXY() || _loc.y > GetMapSizeMaxXY()))
|
||||||
|
|
|
@ -592,7 +592,8 @@ std::unique_ptr<GameActions::Result> Peep::Place(const TileCoordsXYZ& location,
|
||||||
|
|
||||||
if (!map_is_location_owned(destination))
|
if (!map_is_location_owned(destination))
|
||||||
{
|
{
|
||||||
return std::make_unique<GameActions::Result>(GameActions::Status::NotOwned, STR_ERR_CANT_PLACE_PERSON_HERE, STR_NONE);
|
return std::make_unique<GameActions::Result>(
|
||||||
|
GameActions::Status::NotOwned, STR_ERR_CANT_PLACE_PERSON_HERE, STR_LAND_NOT_OWNED_BY_PARK);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (auto res = MapCanConstructAt({ destination, destination.z, destination.z + (1 * 8) }, { 0b1111, 0 });
|
if (auto res = MapCanConstructAt({ destination, destination.z, destination.z + (1 * 8) }, { 0b1111, 0 });
|
||||||
|
|
Loading…
Reference in New Issue