thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASYLUM: a little more work on volume calculation for ambient sound update

Browse source 
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@409 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
Alex Bevilacqua 2009-12-04 14:48:59 +00:00 • committed by Eugene Sandulenko
parent 878182c704
commit 15e2aad8c8
No known key found for this signature in database
GPG key ID: 014D387312D34F08
1 changed files with 20 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

65
engines/asylum/scene.cpp
View file

@ -997,59 +997,34 @@ void Scene::updateAmbientSounds() {
} else { } else {
panning = 0; panning = 0;
} }
if (snd->field_0 == 0) { if (snd->field_0 == 0) {
// FIXME: Applying the minus operator to an unsigned type results volume = -(snd->field_C ^ 2);
// in an unsigned type again. Casting gameFlag to int32 for now
volume = -(int32)(snd->field_C ^ 2);
} else { } else {
; // TODO calculate volume increase volume = calculateVolumeAdjustment(snd, getActor(0));
volume += Config.ambientVolume;
} }
/* if (loflag & 2) {
if (LOBYTE(snd->flags) & 2) { int tmpVol = volume;
if (rand() % 10000 < 10) { if (rand() % 10000 < 10)
if (snd->field_0) { if (snd->field_0) {
_vm->sound()->playSound(_resPack, snd->resId, false, Config.sfxVolume + volume, panning); _vm->sound()->playSound(snd->resId, false, volume, panning, false);
} else { } else {
v15 = rand() % 500; // FIXME will this even work?
v11 = v15 * ((((rand() % 100 >= 50) - 1) & 2) - 1) + volume; tmpVol += (rand() % 500) * (((rand() % 100 >= 50) - 1) & 2) - 1;
v10 = v11; if (tmpVol <= -10000)
if (v11 <= -10000) volume = -10000;
v10 = -10000; if (volume >= 0)
if (v10 >= 0) tmpVol = 0;
v11 = 0;
else else
if (v11 <= -10000) if (tmpVol <= -10000)
v11 = -10000; tmpVol = -10000;
v16 = rand(); _vm->sound()->playSound(snd->resId, 0, tmpVol, rand() % 20001 - 10000);
_vm->sound()->playSound(_resPack, snd->resId, false, v11, v16 % 20001 - 10000);
}
} else {
if (LOBYTE(snd->flags) & 4) {
if ( (unsigned int)*ambientPanningArray < getTickCount() )
{
if ( v1->field_14 >= 0 )
v12 = 60000 * v1->field_14 + getTickCount();
else
v12 = getTickCount() - 1000 * v1->field_14;
*ambientPanningArray = v12;
playSound(v7, 0, v9, panning);
}
} else {
if (LOBYTE(snd->flags) & 8) {
if ( !*(ambientPanningArray - 15) )
{
playSound(v7, 0, v9, panning);
*(ambientPanningArray - 15) = 1;
}
}
} }
} else {
if (loflag & 4) {
// TODO panning array stuff
} }
} */ }
} }
} else { } else {
if (_vm->sound()->isPlaying(snd->resId)) if (_vm->sound()->isPlaying(snd->resId))