mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix ducks asserting due to invalid position

Browse Source
This commit is contained in:
Matt
2019-10-15 17:33:41 +02:00
parent ac30e35dfa
commit 70d37fe8f9
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/openrct2/scenario/Scenario.cpp
View File

@@ -421,9 +421,14 @@ void scenario_update()
*/
bool scenario_create_ducks()
{
// Check NxN area around centre tile defined by SquareSize
constexpr int32_t SquareSize = 7;
constexpr int32_t SquareCentre = SquareSize / 2;
constexpr int32_t SquareTileSize = SquareCentre * 32;
CoordsXY centrePos;
centrePos.x = 64 + (scenario_rand_max(MAXIMUM_MAP_SIZE_PRACTICAL) * 32);
centrePos.y = 64 + (scenario_rand_max(MAXIMUM_MAP_SIZE_PRACTICAL) * 32);
centrePos.x = SquareTileSize + (scenario_rand_max(MAXIMUM_MAP_SIZE_TECHNICAL - SquareCentre) * 32);
centrePos.y = SquareTileSize + (scenario_rand_max(MAXIMUM_MAP_SIZE_TECHNICAL - SquareCentre) * 32);
Guard::Assert(map_is_location_valid(centrePos));
@@ -434,10 +439,6 @@ bool scenario_create_ducks()
if (centreWaterZ == 0)
return false;
// Check NxN area around centre tile defined by SquareSize
constexpr int32_t SquareSize = 7;
constexpr int32_t SquareCentre = SquareSize / 2;
CoordsXY innerPos{ centrePos.x - (32 * SquareCentre), centrePos.y - (32 * SquareCentre) };
int32_t waterTiles = 0;
for (int32_t y = 0; y < SquareSize; y++)
@@ -472,10 +473,11 @@ bool scenario_create_ducks()
for (int32_t i = 0; i < duckCount; i++)
{
int32_t r = scenario_rand();
innerPos.x = (r >> 16) & 0x7F;
innerPos.y = (r & 0xFFFF) & 0x7F;
innerPos.x = (r >> 16) & (SquareTileSize - 1);
innerPos.y = (r & 0xFFFF) & (SquareTileSize - 1);
CoordsXY targetPos{ centrePos.x + innerPos.x - SquareTileSize, centrePos.y + innerPos.y - SquareTileSize };
CoordsXY targetPos{ centrePos.x + innerPos.x - 64, centrePos.y + innerPos.y - 64 };
Guard::Assert(map_is_location_valid(targetPos));
create_duck(targetPos);
}