Fix ghost elements influencing ride excitement

OpenRCT2 · Sep 23, 2019 · b2a42de · b2a42de
1 parent a555564
commit b2a42de
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/distribution/changelog.txt b/distribution/changelog.txt
@@ -22,6 +22,7 @@
 - Fix: [#9926] Africa - Oasis park has wrong peep spawn (original bug).
 - Fix: [#9957] When using 'no money' cheat, guests complain of running out of cash.
 - Fix: [#9970] Wait for quarter load fails.
+- Fix: [#10017] Ghost elements influencing ride excitement.
 - Improved: [#9466] Add the rain weather effect to the OpenGL renderer.
 
 0.2.3 (2019-07-10)

diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp
@@ -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 "14"
+#define NETWORK_STREAM_VERSION "15"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static Peep* _pickup_peep = nullptr;

diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp
@@ -209,6 +209,8 @@ static void ride_ratings_update_state_2()
     TileElement* tileElement = map_get_first_element_at(x, y);
     do
     {
+        if (tileElement->IsGhost())
+            continue;
         if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK)
             continue;
         if (tileElement->base_height != z)
@@ -313,6 +315,8 @@ static void ride_ratings_update_state_5()
     TileElement* tileElement = map_get_first_element_at(x, y);
     do
     {
+        if (tileElement->IsGhost())
+            continue;
         if (tileElement->GetType() != TILE_ELEMENT_TYPE_TRACK)
             continue;
         if (tileElement->base_height != z)
@@ -417,6 +421,9 @@ static void ride_ratings_score_close_proximity_in_direction(TileElement* inputTi
     TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5);
     do
     {
+        if (tileElement->IsGhost())
+            continue;
+
         switch (tileElement->GetType())
         {
             case TILE_ELEMENT_TYPE_SURFACE:
@@ -466,6 +473,9 @@ static void ride_ratings_score_close_proximity_loops_helper(TileElement* inputTi
     TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5);
     do
     {
+        if (tileElement->IsGhost())
+            continue;
+
         switch (tileElement->GetType())
         {
             case TILE_ELEMENT_TYPE_PATH:
@@ -537,6 +547,9 @@ static void ride_ratings_score_close_proximity(TileElement* inputTileElement)
     TileElement* tileElement = map_get_first_element_at(x >> 5, y >> 5);
     do
     {
+        if (tileElement->IsGhost())
+            continue;
+
         int32_t waterHeight;
         switch (tileElement->GetType())
         {