From 4aabc003351cc199f2b18a1178d10b8802debfeb Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 5 Oct 2022 13:57:22 -0400 Subject: [PATCH] Fix: ghosts are counted in guest scenery or fountain thoughts --- contributors.md | 2 +- distribution/changelog.txt | 1 + src/openrct2/entity/Guest.cpp | 5 +++++ src/openrct2/network/NetworkBase.cpp | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contributors.md b/contributors.md index b85d7472eb..9858923a9d 100644 --- a/contributors.md +++ b/contributors.md @@ -57,7 +57,7 @@ The following people are not part of the development team, but have been contrib * Inseok Lee (dlunch) - Load save files from command line * Jørn Lomax (jvlomax) - Configuration parser * Alexander Overvoorde (Overv) - OpenGL improvements, Steam overlay detection, various bugfixes. -* (eezstreet) - Add finances button to toolbar +* (eezstreet) - Add finances button to toolbar, various bugfixes. * Hielke Morsink (Broxzier) - Tile inspector, heightmap loader, misc. * Joe Minor Jr (wolfreak99) - Various cheats, bugfixes, new About and Changelog windows. * Thomas den Hollander (ThomasdenH) - Dithering in sprite importer, invert viewport dragging, park rating cheats misc. diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 9aeac35973..3a51763711 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -1,6 +1,7 @@ 0.4.3 (in development) ------------------------------------------------------------------------ - Fix: [#14312] Research ride type message incorrect. +- Fix: [#18122] Ghosts count towards “Great scenery!” guest thought. 0.4.2 (2022-10-05) ------------------------------------------------------------------------ diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index c2df3e5a51..81e9758564 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -2924,6 +2924,11 @@ static PeepThoughtType peep_assess_surroundings(int16_t centre_x, int16_t centre { Ride* ride; + if (tileElement->IsGhost()) + { + continue; + } + switch (tileElement->GetType()) { case TileElementType::Path: diff --git a/src/openrct2/network/NetworkBase.cpp b/src/openrct2/network/NetworkBase.cpp index a8f7d338ee..2ff481d81f 100644 --- a/src/openrct2/network/NetworkBase.cpp +++ b/src/openrct2/network/NetworkBase.cpp @@ -42,7 +42,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 "0" +#define NETWORK_STREAM_VERSION "1" #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION static Peep* _pickup_peep = nullptr;