mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Fix #13257: Rides w/ exactly the minimum objective length not counted (#13446)

Browse Source
This commit is contained in:
Michael Steenbeek
2020-11-23 23:22:16 +01:00
committed by GitHub
parent 6c4df9c54d
commit b595370648
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -4,6 +4,7 @@
- Feature: [#13376] Open custom window at specified tab. - Feature: [#13376] Open custom window at specified tab.
- Change: [#13346] Change FootpathScenery to FootpathAddition in all occurrences. - Change: [#13346] Change FootpathScenery to FootpathAddition in all occurrences.
- Fix: [#12895] Mechanics are called to repair rides that have already been fixed. - Fix: [#12895] Mechanics are called to repair rides that have already been fixed.
- Fix: [#13257] Rides that are exactly the minimum objective length are not counted.
- Fix: [#13334] Uninitialised variables in CustomTabDesc. - Fix: [#13334] Uninitialised variables in CustomTabDesc.
- Fix: [#13342] Rename tabChange to onTabChange in WindowDesc interface. - Fix: [#13342] Rename tabChange to onTabChange in WindowDesc interface.
- Fix: [#13409] Clamp peep distances from path centers. - Fix: [#13409] Clamp peep distances from path centers.

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

@@ -34,7 +34,7 @@
// This string specifies which version of network stream current build uses. // This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within // It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version. // single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "4" #define NETWORK_STREAM_VERSION "5"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr; static Peep* _pickup_peep = nullptr;

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

@@ -867,7 +867,7 @@ ObjectiveStatus Objective::Check10RollerCoastersLength() const
{ {
if (ride_entry_has_category(rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype]) if (ride_entry_has_category(rideEntry, RIDE_CATEGORY_ROLLERCOASTER) && !type_already_counted[ride.subtype])
{ {
if ((ride_get_total_length(&ride) >> 16) > MinimumLength) if ((ride_get_total_length(&ride) >> 16) >= MinimumLength)
{ {
type_already_counted[ride.subtype] = true; type_already_counted[ride.subtype] = true;
rcs++; rcs++;