mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-16 12:32:29 +01:00
Code Issues Releases Wiki Activity

Fix 14774: Scenery research always unlocks on load (#14777)

Browse Source 
* Fix #14774: Incorrect import of scenery research

Mistake during a refactor caused all scenery to be imported as already researched.

* Update changelog

* Update network version
This commit is contained in:
Duncan
2021-05-28 18:55:19 +01:00
committed by GitHub
parent 380d3a6cbe
commit 21bb949322
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

@@ -25,6 +25,7 @@
- Fix: [#14682] Crash when painting Swinging Ships with invalid subtype. - Fix: [#14682] Crash when painting Swinging Ships with invalid subtype.
- Fix: [#14707] Crash when window is closed during text input. - Fix: [#14707] Crash when window is closed during text input.
- Fix: [#14710] Ride/Track Design preview does not show if it costs more money than available. - Fix: [#14710] Ride/Track Design preview does not show if it costs more money than available.
- Fix: [#14774] Incorrect import of scenery research caused all scenery to be unlocked.
- Improved: [#14511] “Unlock operating limits” cheat now also unlocks all music. - Improved: [#14511] “Unlock operating limits” cheat now also unlocks all music.
- Improved: [#14712, #14716]: Improve startup times. - Improved: [#14712, #14716]: Improve startup times.

2
src/openrct2/management/Research.cpp
View File

@@ -657,7 +657,7 @@ void set_all_scenery_items_not_invented()
{ {
for (auto sceneryType = 0; sceneryType < SCENERY_TYPE_COUNT; sceneryType++) for (auto sceneryType = 0; sceneryType < SCENERY_TYPE_COUNT; sceneryType++)
{ {
std::fill(std::begin(_researchedSceneryItems[sceneryType]), std::end(_researchedSceneryItems[sceneryType]), true); std::fill(std::begin(_researchedSceneryItems[sceneryType]), std::end(_researchedSceneryItems[sceneryType]), false);
} }
} }

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

@@ -36,7 +36,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 "16" #define NETWORK_STREAM_VERSION "17"
#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;