From d6ffdb0aa12e21e0ba0ddb39c0668433eb8c2d1a Mon Sep 17 00:00:00 2001
From: zzril <>
Date: Sun, 2 Apr 2023 00:24:37 +0200
Subject: [PATCH] Add Pitch values for steep diagonal drops to checks in
 UpdateScreamSound

The checks in UpdateScreamSound (rct2: 0x006D796B) forgot about (steep)
diagonal drops. This resulted in riders' screams getting cut-off on
(long) steep diagonal drops once the last car reached the maximum drop
angle, and the screams re-starting as soon as the first car reached the
valley.
---
 src/openrct2/ride/Vehicle.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index ea455677fc..1ca87f3e9b 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -5529,6 +5529,10 @@ OpenRCT2::Audio::SoundId Vehicle::UpdateScreamSound()
                 continue;
             if (vehicle2->Pitch <= 15)
                 return ProduceScreamSound(totalNumPeeps);
+            // Pitch 52 occurs on steep diagonal backward drops.
+            // (50 and 51 occur on gentle ones.)
+            if (vehicle2->Pitch == 52)
+                return ProduceScreamSound(totalNumPeeps);
         }
         return OpenRCT2::Audio::SoundId::Null;
     }
@@ -5547,6 +5551,10 @@ OpenRCT2::Audio::SoundId Vehicle::UpdateScreamSound()
             continue;
         if (vehicle2->Pitch <= 23)
             return ProduceScreamSound(totalNumPeeps);
+        // Pitch 55 occurs on steep diagonal drops.
+        // (53 and 54 occur on gentle ones.)
+        if (vehicle2->Pitch == 55)
+            return ProduceScreamSound(totalNumPeeps);
     }
     return OpenRCT2::Audio::SoundId::Null;
 }