summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-23 22:25:14 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-23 22:25:14 +0200
commitac208ce02cd23d534e50a453080919d4f491c0fd (patch)
tree30966703cf4078a2d9d5e169d2431a4243fef23d
parentMore audio cleanup (diff)
downloadre3-ac208ce02cd23d534e50a453080919d4f491c0fd.tar
re3-ac208ce02cd23d534e50a453080919d4f491c0fd.tar.gz
re3-ac208ce02cd23d534e50a453080919d4f491c0fd.tar.bz2
re3-ac208ce02cd23d534e50a453080919d4f491c0fd.tar.lz
re3-ac208ce02cd23d534e50a453080919d4f491c0fd.tar.xz
re3-ac208ce02cd23d534e50a453080919d4f491c0fd.tar.zst
re3-ac208ce02cd23d534e50a453080919d4f491c0fd.zip
Diffstat (limited to '')
-rw-r--r--src/audio/AudioLogic.cpp6
-rw-r--r--src/audio/AudioManager.cpp4
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;
}