summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-11-02 10:05:23 +0100
committerRoman Masanin <36927roma@gmail.com>2020-11-02 10:05:23 +0100
commit174424c5206100e442342b2e9b0cff5c16b239db (patch)
tree61238760fcc80a8e02512583d8af0afd45893426 /src/audio
parentmark code (diff)
downloadre3-174424c5206100e442342b2e9b0cff5c16b239db.tar
re3-174424c5206100e442342b2e9b0cff5c16b239db.tar.gz
re3-174424c5206100e442342b2e9b0cff5c16b239db.tar.bz2
re3-174424c5206100e442342b2e9b0cff5c16b239db.tar.lz
re3-174424c5206100e442342b2e9b0cff5c16b239db.tar.xz
re3-174424c5206100e442342b2e9b0cff5c16b239db.tar.zst
re3-174424c5206100e442342b2e9b0cff5c16b239db.zip
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/AudioLogic.cpp14
-rw-r--r--src/audio/AudioManager.cpp1
2 files changed, 2 insertions, 13 deletions
diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 44ca4b65..3c95273a 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -179,7 +179,7 @@ cAudioManager::PostInitialiseGameSpecificSetup()
ResetAudioLogicTimers(CTimer::GetTimeInMilliseconds());
m_bIsPlayerShutUp = false;
- m_nPlayerMood = 0;
+ m_nPlayerMood = PLAYER_MOOD_CALM;
m_nPlayerMoodTimer = 0;
}
@@ -863,7 +863,7 @@ void cAudioManager::ProcessVehicle(CVehicle* veh)
}
void
-cAudioManager::ProcessRainOnVehicle(cVehicleParams* params)
+cAudioManager::ProcessRainOnVehicle(cVehicleParams *params)
{
const int SOUND_INTENSITY = 22.0f;
@@ -3151,16 +3151,6 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams *params)
}
m_sQueueSample.m_bIs2D = false;
AddSampleToRequestedQueue();
-/* looks like this code ca't be reached(originaly it exist bcs used goto)
- if (isHeli) {
- m_sQueueSample.m_nOffset = 127;
- m_sQueueSample.m_nSampleIndex++;
- m_sQueueSample.m_nCounter = GunIndex++;
- if (GunIndex > 58)
- GunIndex = 53;
- m_sQueueSample.m_bRequireReflection = 0;
- AddSampleToRequestedQueue();
- }*/
continue;
}
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 516cc8af..c9bd6c17 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -438,7 +438,6 @@ cAudioManager::IsAudioInitialised() const
void
cAudioManager::ServiceSoundEffects()
{
- m_FrameCounter++;
m_bFifthFrameFlag = (m_FrameCounter++ % 5) == 0;
if (m_nUserPause && !m_nPreviousUserPause) {
for (int32 i = 0; i < allChannels; i++)