From 247e89eb533d8aff60fb95c3d5f712b78775c32d Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 24 Jan 2019 10:40:04 +0100 Subject: [PATCH] Revert duck fix --- src/openrct2/network/Network.cpp | 2 +- src/openrct2/scenario/Scenario.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 5afa1908cc..806997a167 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -30,7 +30,7 @@ // This string specifies which version of network stream current build uses. // It is used for making sure only compatible builds get connected, even within // single OpenRCT2 version. -#define NETWORK_STREAM_VERSION "23" +#define NETWORK_STREAM_VERSION "24" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static rct_peep* _pickup_peep = nullptr; diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index f5a647fd07..eaa6bf5862 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -426,13 +426,11 @@ static int32_t scenario_create_ducks() { int32_t i, j, r, c, x, y, waterZ, centreWaterZ, x2, y2; - // Originally, this function generated coordinates from 64 to 191. - // It now generates coordinates from 0 to 255, so smaller maps may also spawn ducks. r = scenario_rand(); - x = ((r >> 16) & 0xFFFF) % MAXIMUM_MAP_SIZE_TECHNICAL; - y = (r & 0xFFFF) % MAXIMUM_MAP_SIZE_TECHNICAL; - x = x * 32; - y = y * 32; + x = ((r >> 16) & 0xFFFF) & 0x7F; + y = (r & 0xFFFF) & 0x7F; + x = (x + 64) * 32; + y = (y + 64) * 32; if (!map_is_location_in_park({ x, y })) return 0;