From 4c220b1f9583e2db3cdbb99fcdecd82ae4fe9e0d Mon Sep 17 00:00:00 2001
From: Roman Masanin <36927roma@gmail.com>
Date: Sat, 26 Sep 2020 21:07:51 +0300
Subject: return bridge, crane and fix structures in fluff.h

---
 src/audio/AudioLogic.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/audio')

diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index b04030dc..60989aba 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -366,12 +366,26 @@ cAudioManager::ProcessEntity(int32 id)
 					ProcessWeather(id);
 			}
 			break;
+/*		case AUDIOTYPE_CRANE:
+			if (!m_nUserPause) {
+				m_sQueueSample.m_bReverbFlag = true;
+				ProcessCrane();
+			}
+			break;*/
 		case AUDIOTYPE_SCRIPTOBJECT:
 			if (!m_nUserPause) {
 				m_sQueueSample.m_bReverbFlag = true;
 				ProcessScriptObject(id);
 			}
 			break;
+#ifdef GTA_BRIDGE
+		case AUDIOTYPE_BRIDGE:
+			if (!m_nUserPause) {
+				m_sQueueSample.m_bReverbFlag = true;
+				ProcessBridge();
+			}
+			break;
+#endif
 		case AUDIOTYPE_FRONTEND:
 			m_sQueueSample.m_bReverbFlag = false;
 			ProcessFrontEnd();
@@ -4973,9 +4987,9 @@ cAudioManager::ProcessEscalators()
 	float distance;
 
 	for (int i = 0; i < CEscalators::NumEscalators; i++) {
-		if (!CEscalators::aEscalators[i].m_bIsActive)
+		if (!CEscalators::GetEscalator(i).IsActive())
 			continue;
-		m_sQueueSample.m_vecPos = CEscalators::aEscalators[i].m_midPoint;
+		m_sQueueSample.m_vecPos = CEscalators::GetEscalator(i).GetPosition();
 		distance = GetDistanceSquared(m_sQueueSample.m_vecPos);
 		if (distance < SQR(SOUND_INTENSITY)) {
 			if (distance > 0.0f)
-- 
cgit v1.2.3