From b4bbd91921833ce92c78a470863b4a3e441d4c8f Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 6 May 2020 16:56:59 +0200 Subject: got rid of superfluous enum --- src/objects/Object.cpp | 16 ++++++++-------- src/objects/Object.h | 12 ------------ 2 files changed, 8 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/objects/Object.cpp b/src/objects/Object.cpp index ab1290b0..a450ca56 100644 --- a/src/objects/Object.cpp +++ b/src/objects/Object.cpp @@ -173,12 +173,12 @@ CObject::ObjectDamage(float amount) const float fDirectionZ = 0.0002f * amount; switch (m_nCollisionDamageEffect) { - case COLDAMAGE_EFFECT_CHANGE_MODEL: + case COLLRESPONSE_CHANGE_MODEL: bRenderDamaged = true; break; - case COLDAMAGE_EFFECT_SPLIT_MODEL: + case COLLRESPONSE_SPLIT_MODEL: break; - case COLDAMAGE_EFFECT_SMASH_COMPLETELY: + case COLLRESPONSE_SMASH_COMPLETELY: bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -186,7 +186,7 @@ CObject::ObjectDamage(float amount) SetMoveSpeed(0.0f, 0.0f, 0.0f); SetTurnSpeed(0.0f, 0.0f, 0.0f); break; - case COLDAMAGE_EFFECT_CHANGE_THEN_SMASH: + case COLLRESPONSE_CHANGE_THEN_SMASH: if (!bRenderDamaged) { bRenderDamaged = true; } @@ -199,7 +199,7 @@ CObject::ObjectDamage(float amount) SetTurnSpeed(0.0f, 0.0f, 0.0f); } break; - case COLDAMAGE_EFFECT_SMASH_CARDBOX_COMPLETELY: { + case COLLRESPONSE_SMASH_CARDBOARD_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -222,7 +222,7 @@ CObject::ObjectDamage(float amount) PlayOneShotScriptObject(_SCRSOUND_CARDBOARD_BOX_SMASH, vecPos); break; } - case COLDAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY: { + case COLLRESPONSE_SMASH_WOODENBOX_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -245,7 +245,7 @@ CObject::ObjectDamage(float amount) PlayOneShotScriptObject(_SCRSOUND_WOODEN_BOX_SMASH, vecPos); break; } - case COLDAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY: { + case COLLRESPONSE_SMASH_TRAFFICCONE_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; @@ -270,7 +270,7 @@ CObject::ObjectDamage(float amount) PlayOneShotScriptObject(_SCRSOUND_TYRE_BUMP, vecPos); break; } - case COLDAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY: { + case COLLRESPONSE_SMASH_BARPOST_COMPLETELY: { bIsVisible = false; bUsesCollision = false; bIsStatic = true; diff --git a/src/objects/Object.h b/src/objects/Object.h index 319ec4bc..dfaa60db 100644 --- a/src/objects/Object.h +++ b/src/objects/Object.h @@ -10,18 +10,6 @@ enum { CUTSCENE_OBJECT = 4, }; -enum { - COLDAMAGE_EFFECT_NONE = 0, - COLDAMAGE_EFFECT_CHANGE_MODEL = 1, - COLDAMAGE_EFFECT_SPLIT_MODEL = 2, - COLDAMAGE_EFFECT_SMASH_COMPLETELY = 3, - COLDAMAGE_EFFECT_CHANGE_THEN_SMASH = 4, - COLDAMAGE_EFFECT_SMASH_CARDBOX_COMPLETELY = 50, - COLDAMAGE_EFFECT_SMASH_WOODENBOX_COMPLETELY = 60, - COLDAMAGE_EFFECT_SMASH_TRAFFICCONE_COMPLETELY = 70, - COLDAMAGE_EFFECT_SMASH_BARPOST_COMPLETELY = 80, -}; - enum { COLLRESPONSE_NONE, COLLRESPONSE_CHANGE_MODEL, -- cgit v1.2.3 From daa3b2047757f1b4218a75aeaa66fb5d22f41689 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Wed, 6 May 2020 18:01:52 +0300 Subject: Fix cAudioManager::ProcessActiveQueues loop --- src/audio/AudioManager.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp index 0f4281dc..ec520eaa 100644 --- a/src/audio/AudioManager.cpp +++ b/src/audio/AudioManager.cpp @@ -609,10 +609,9 @@ cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float d float newSoundIntensity; if (soundIntensity <= 0.0f) return 0; - if ((soundIntensity * 0.2f) <= distance) { - newSoundIntensity = soundIntensity * 0.2f; + newSoundIntensity = soundIntensity / 5.0f; + if (newSoundIntensity <= distance) emittingVolume = sq((soundIntensity - newSoundIntensity - (distance - newSoundIntensity)) / (soundIntensity - newSoundIntensity)) * emittingVolume; - } return emittingVolume; } @@ -3611,11 +3610,10 @@ cAudioManager::ProcessActiveQueues() SampleManager.SetChannel3DDistances(j, sample.m_fSoundIntensity, 0.25f * sample.m_fSoundIntensity); } SampleManager.SetChannelReverbFlag(j, sample.m_bReverbFlag); - continue; + break; } sample.m_bIsProcessed = false; m_asActiveSamples[j].m_bIsProcessed = false; - break; } } } -- cgit v1.2.3