From 861da4b3676e5013033aee8d804cf9410dba4f16 Mon Sep 17 00:00:00 2001 From: Veyrdite Date: Sun, 1 Aug 2021 15:01:52 +1000 Subject: [PATCH] Revert "Fix car fake/cruise top gear SFX at high FPS.", to make merging main miami branch easier. Will-reimplement This reverts commit 2d3f93e60e876083cb5c049c018ed8b3bd7b1915. --- src/audio/AudioLogic.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp index 34d58cb240..6c53eb1042 100644 --- a/src/audio/AudioLogic.cpp +++ b/src/audio/AudioLogic.cpp @@ -1977,18 +1977,11 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams& params, CVehicle* veh SampleManager.StopChannel(CHANNEL_PLAYER_VEHICLE_ENGINE); if (isMoped || accelerateState >= 150 && wheelsOnGround && brakeState <= 0 && !params.m_pVehicle->bIsHandbrakeOn && !lostTraction && currentGear >= params.m_pTransmission->nNumberOfGears - 1) { - -#ifdef FIX_BUGS - // Stop the fake top ("cruise") gear rising in pitch too quickly at high FPS. - if (CTimer::GetLogicalFramesPassed()) -#endif - { - if (accelerateState >= 220 && params.m_fVelocityChange + 0.001f >= velocityChangeForAudio) { - if (nCruising < 800) - ++nCruising; - } else if (nCruising > 3) { - --nCruising; - } + if (accelerateState >= 220 && params.m_fVelocityChange + 0.001f >= velocityChangeForAudio) { + if (nCruising < 800) + ++nCruising; + } else if (nCruising > 3) { + --nCruising; } freq = 27 * nCruising + freqModifier + 22050; if (engineSoundType == SFX_BANK_TRUCK)