diff options
author | Travis Howell | 2004-02-15 08:06:32 +0000 |
---|---|---|
committer | Travis Howell | 2004-02-15 08:06:32 +0000 |
commit | 71fb488482dc39976498d0317b2620e4e2a30b2c (patch) | |
tree | e4c44407f04c8be74b2987619d760cab1d97b672 /scumm | |
parent | 7b67425bc20a064d6e72b09ca32f8ace945683d4 (diff) | |
download | scummvm-rg350-71fb488482dc39976498d0317b2620e4e2a30b2c.tar.gz scummvm-rg350-71fb488482dc39976498d0317b2620e4e2a30b2c.tar.bz2 scummvm-rg350-71fb488482dc39976498d0317b2620e4e2a30b2c.zip |
Another Amiga V3 sounds update from Quietust:
Music is closer to the way it sounds on a real Amiga
Fixes the drums in the Indy3 'Berlin' music
svn-id: r12903
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/player_v3a.cpp | 2 | ||||
-rw-r--r-- | scumm/player_v3a.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scumm/player_v3a.cpp b/scumm/player_v3a.cpp index 3a4356c169..cc25d2482f 100644 --- a/scumm/player_v3a.cpp +++ b/scumm/player_v3a.cpp @@ -311,6 +311,8 @@ void Player_V3A::playMusic() { if (oct > 5) oct = 5; int rate = 3579545 / note_freqs[_wavetable[inst]->_oct[oct]][pit]; + if (!_wavetable[inst]->_llen[oct]) + dur = _wavetable[inst]->_ilen[oct] * 60 / rate; char *data = (char *)malloc(_wavetable[inst]->_ilen[oct] + _wavetable[inst]->_llen[oct]); if (_wavetable[inst]->_idat[oct]) memcpy(data, _wavetable[inst]->_idat[oct], _wavetable[inst]->_ilen[oct]); diff --git a/scumm/player_v3a.h b/scumm/player_v3a.h index 434c0de207..fb8dc6a902 100644 --- a/scumm/player_v3a.h +++ b/scumm/player_v3a.h @@ -51,7 +51,7 @@ public: private: enum { - V3A_MAXMUS = 16, + V3A_MAXMUS = 24, V3A_MAXSFX = 16 }; |