Fix #5451: Guests scream on every descent, no matter how small

contributors.md

@@ -140,6 +140,7 @@ The following people are not part of the development team, but have been contrib
 * (WantDiscussion)
 * Tomáš Žilínek (TomasZilinek)
 * Mustapha Elghoul (mustaphaelghoul)
+* Tyler Leamon (tylerleamon)
 
 ## Toolchain
 * (Balletie) - macOS

distribution/changelog.txt

@@ -9,11 +9,12 @@
 - Change: [#11358] Switch copy and paste button positions in tile inspector.
 - Change: [#11449] Remove complete circuit requirement from Air Powered Vertical Coaster (for RCT1 parity).
 - Fix: [#1148] Research funding dropdown not shown in finances window.
+- Fix: [#5451] Guests scream on every descent, no matter how small.
 - Fix: [#6119] Advertising campaign for ride window not updated properly (original bug).
 - Fix: [#7006] Submarine Ride is in the wrong research group.
 - Fix: [#11072] Land and water tools working out of bounds (original bug).
 - Fix: [#11259] Custom JSON object breaks saves.
-- Fix: [#11290] Perform funds checking for all peeps entering a ride. 
+- Fix: [#11290] Perform funds checking for all peeps entering a ride.
 - Fix: [#11315] Ride that has never opened is shown as favorite ride of many guests.
 - Fix: [#11405] Building a path through walls does not always remove the walls.
 - Fix: RCT1 scenarios have more items in the object list than are present in the park or the research list.
@@ -35,7 +36,7 @@
 - Fix: [#6123, #7907, #9472, #11028] Cannot build some track designs with 4 stations (original bug).
 - Fix: [#6238] Invalid tile elem iteration in Guest::UpdateUsingBin
 - Fix: [#7094] Back wall edge texture in water missing.
-- Fix: [#9719] Hacked walls in RCT1 saves are imported incorrectly. 
+- Fix: [#9719] Hacked walls in RCT1 saves are imported incorrectly.
 - Fix: [#10372, #10509, #10806] Lift base sections incorrectly exporting, causing various lift related bugs.
 - Fix: [#10928] File browser's date column is too narrow.
 - Fix: [#10951, #11160] Attempting to place park entrances creates ghost entrances in random locations.

src/openrct2/network/Network.cpp

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

src/openrct2/ride/Vehicle.cpp

@@ -5467,7 +5467,7 @@ void Vehicle::UpdateSound()
 
     switch (vehicleEntry->sound_range)
     {
-        case 3:
+        case SOUND_RANGE_WHISTLE:
             screamId = scream_sound_id;
             if (!(gCurrentTicks & 0x7F))
             {
@@ -5486,7 +5486,7 @@ void Vehicle::UpdateSound()
             screamVolume = 255;
             break;
 
-        case 4:
+        case SOUND_RANGE_BELL:
             screamId = scream_sound_id;
             if (!(gCurrentTicks & 0x7F))
             {
@@ -5511,7 +5511,7 @@ void Vehicle::UpdateSound()
                 screamId = UpdateScreamSound();
                 if (screamId == SoundId::NoScream)
                     screamId = SoundId::Null;
-                if (screamId == SoundId::Null)
+                else if (screamId == SoundId::Null)
                     goto loc_6D7A97;
                 break;
             }
@@ -5612,13 +5612,13 @@ produceScream:
         {
             switch (vehicleEntry->sound_range)
             {
-                case 0:
+                case SOUND_RANGE_SCREAMS_0:
                     scream_sound_id = byte_9A3A14[r % 2];
                     break;
-                case 1:
+                case SOUND_RANGE_SCREAMS_1:
                     scream_sound_id = byte_9A3A18[r % 7];
                     break;
-                case 2:
+                case SOUND_RANGE_SCREAMS_2:
                     scream_sound_id = byte_9A3A16[r % 2];
                     break;
                 default: