forked from teamnwah/openmw-tes3coop
Merged pull request #1841
This commit is contained in:
commit
99c03d55f0
2 changed files with 5 additions and 8 deletions
|
@ -76,6 +76,7 @@
|
||||||
Bug #4519: Knockdown does not discard movement in the 1st-person mode
|
Bug #4519: Knockdown does not discard movement in the 1st-person mode
|
||||||
Bug #4539: Paper Doll is affected by GUI scaling
|
Bug #4539: Paper Doll is affected by GUI scaling
|
||||||
Bug #4545: Creatures flee from werewolves
|
Bug #4545: Creatures flee from werewolves
|
||||||
|
Bug #4551: Replace 0 sound range with default range separately
|
||||||
Feature #2606: Editor: Implemented (optional) case sensitive global search
|
Feature #2606: Editor: Implemented (optional) case sensitive global search
|
||||||
Feature #3083: Play animation when NPC is casting spell via script
|
Feature #3083: Play animation when NPC is casting spell via script
|
||||||
Feature #3103: Provide option for disposition to get increased by successful trade
|
Feature #3103: Provide option for disposition to get increased by successful trade
|
||||||
|
|
|
@ -142,16 +142,12 @@ namespace MWSound
|
||||||
float volume, min, max;
|
float volume, min, max;
|
||||||
|
|
||||||
volume = static_cast<float>(pow(10.0, (sound->mData.mVolume / 255.0*3348.0 - 3348.0) / 2000.0));
|
volume = static_cast<float>(pow(10.0, (sound->mData.mVolume / 255.0*3348.0 - 3348.0) / 2000.0));
|
||||||
if(sound->mData.mMinRange == 0 && sound->mData.mMaxRange == 0)
|
min = sound->mData.mMinRange;
|
||||||
{
|
max = sound->mData.mMaxRange;
|
||||||
|
if (min == 0)
|
||||||
min = fAudioDefaultMinDistance;
|
min = fAudioDefaultMinDistance;
|
||||||
|
if (max == 0)
|
||||||
max = fAudioDefaultMaxDistance;
|
max = fAudioDefaultMaxDistance;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
min = sound->mData.mMinRange;
|
|
||||||
max = sound->mData.mMaxRange;
|
|
||||||
}
|
|
||||||
|
|
||||||
min *= fAudioMinDistanceMult;
|
min *= fAudioMinDistanceMult;
|
||||||
max *= fAudioMaxDistanceMult;
|
max *= fAudioMaxDistanceMult;
|
||||||
|
|
Loading…
Reference in a new issue