mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix entrance or exit stacked on top considered a duplicate

Browse source
This commit is contained in:
ζeh Matt 2021-01-29 17:19:07 +02:00 committed by GitHub
parent 900a30507c
commit 109a06663d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/changelog.txt
View file

@ -38,6 +38,7 @@
- Fix: [#13510] [Plugin] list view scroll resets when items is set.
- Fix: [#13574] Crash when a JSON object does not set `originalId`.
- Fix: [#13832] Players last action position is invalid on opening/closing a ride in multiplayer.
- Fix: [#13937] Pathfinding gets confused when two entrances/exits from the same ride are on top of each other.
- Improved: [#6022] Allow up to 128 ride objects to be selected in track designer.
- Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths.
- Improved: [#13386] A GUI error message is now displayed if the language files are missing.

2
src/openrct2/network/NetworkBase.cpp
View file

@ -34,7 +34,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 "15"
#define NETWORK_STREAM_VERSION "16"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;

3
src/openrct2/ride/Ride.cpp
View file

@ -6710,7 +6710,8 @@ void sub_6CB945(Ride* ride)
while (locationList != locations.cend())
{
const TileCoordsXYZD& locationCoords2 = *locationList++;
if (locationCoords.x == locationCoords2.x && locationCoords.y == locationCoords2.y)
if (locationCoords.x == locationCoords2.x && locationCoords.y == locationCoords2.y
&& locationCoords.z == locationCoords2.z)
{
duplicateLocation = true;
break;