diff options
| author | Max Horn | 2003-09-07 19:28:45 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-07 19:28:45 +0000 |
| commit | 1dbab0237f253f2427e8218b3c5a2c97fdfb3f62 (patch) | |
| tree | 8586e18d708106b7ebdbe50d2ace44633e967274 /scumm/player_v3a.cpp | |
| parent | 361c3b95d52babd23b78864e6679334ed1c9e316 (diff) | |
| download | scummvm-rg350-1dbab0237f253f2427e8218b3c5a2c97fdfb3f62.tar.gz scummvm-rg350-1dbab0237f253f2427e8218b3c5a2c97fdfb3f62.tar.bz2 scummvm-rg350-1dbab0237f253f2427e8218b3c5a2c97fdfb3f62.zip | |
cleanup/refactoring
svn-id: r10070
Diffstat (limited to 'scumm/player_v3a.cpp')
| -rw-r--r-- | scumm/player_v3a.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scumm/player_v3a.cpp b/scumm/player_v3a.cpp index 78c9391f27..adbafe74af 100644 --- a/scumm/player_v3a.cpp +++ b/scumm/player_v3a.cpp @@ -70,7 +70,7 @@ Player_V3A::~Player_V3A() { free(_wavetable); } -void Player_V3A::set_master_volume (int vol) { +void Player_V3A::setMasterVolume (int vol) { _maxvol = vol; } @@ -132,7 +132,8 @@ void Player_V3A::playSound (int nr, char *data, int size, int rate, int vol, int vol = (vol * _maxvol) / 255; if (looped) _mixer->playRaw(NULL, data, size, rate, SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, nr, vol, 0, loopStart, loopEnd); - else _mixer->playRaw(NULL, data, size, rate, SoundMixer::FLAG_AUTOFREE, nr, vol, 0); + else + _mixer->playRaw(NULL, data, size, rate, SoundMixer::FLAG_AUTOFREE, nr, vol, 0); } void Player_V3A::startSound(int nr) { @@ -286,7 +287,8 @@ void Player_V3A::playMusic() { if (!_lastSample) _lastSample++; int id = (_curSong << 8) | _lastSample++; - playSound(id,data,_wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct],3579545 / _notefreqs[_wavetable[inst]->_oct[oct]][pit],255,dur,(_wavetable[inst]->_ldat[oct] != NULL),_wavetable[inst]->_ilen[oct],_wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct]); + playSound(id, data, _wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct], 3579545 / _notefreqs[_wavetable[inst]->_oct[oct]][pit], 255, dur, + (_wavetable[inst]->_ldat[oct] != NULL), _wavetable[inst]->_ilen[oct], _wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct]); } } |