From ac208ce02cd23d534e50a453080919d4f491c0fd Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sat, 23 May 2020 23:25:14 +0300
Subject: [PATCH] Even more small audio cleanup
---
src/audio/AudioLogic.cpp | 6 +++---
src/audio/AudioManager.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 07f80d72..6ac0ea4b 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -1158,7 +1158,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
static int16 LastBrake = 0;
static uint8 CurrentPretendGear = 1;
static bool bLostTractionLastFrame = false;
- static bool bHandbrakeOnLastFrame = 0;
+ static bool bHandbrakeOnLastFrame = false;
static int32 nCruising = 0;
static bool bAccelSampleStopped = true;
@@ -1171,7 +1171,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
LastAccel = 0;
bLostTractionLastFrame = false;
LastBrake = 0;
- bHandbrakeOnLastFrame = 0;
+ bHandbrakeOnLastFrame = false;
CurrentPretendGear = 1;
}
if (CReplay::IsPlayingBack()) {
@@ -1720,7 +1720,7 @@ cAudioManager::ProcessVehicleDoors(cVehicleParams *params)
for (int32 i = 0; i < ARRAY_SIZE(automobile->Doors); i++) {
if (automobile->Damage.GetDoorStatus(i) == DOOR_STATUS_SWINGING) {
doorState = automobile->Doors[i].m_nDoorState;
- if (doorState == DOOR_STATUS_SMASHED || doorState == DOOR_STATUS_SWINGING) {
+ if (doorState == DOORST_OPEN || doorState == DOORST_CLOSED) {
velocity = Min(0.3f, Abs(automobile->Doors[i].m_fAngVel));
if (velocity > 0.0035f) {
emittingVol = (100.f * velocity * 10.f / 3.f);
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index bd1ac84b..c34ad90a 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -39,8 +39,8 @@ cAudioManager::cAudioManager()
}
m_nAudioEntitiesTotal = 0;
m_FrameCounter = 0;
- m_bFifthFrameFlag = 0;
- m_bTimerJustReset = 0;
+ m_bFifthFrameFlag = false;
+ m_bTimerJustReset = false;
m_nTimer = 0;
}