aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorathrxx2011-06-02 16:51:54 +0200
committerathrxx2011-06-02 16:56:01 +0200
commitc1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3 (patch)
tree1c9d7f8d2d9e2bf4791ff13bedbb2582687f4180 /audio
parent4b77a5a12e42e11270d32ac1d92fd1c67a6da789 (diff)
downloadscummvm-rg350-c1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3.tar.gz
scummvm-rg350-c1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3.tar.bz2
scummvm-rg350-c1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3.zip
FM-TOWNS AUDIO: fix regression
Diffstat (limited to 'audio')
-rw-r--r--audio/softsynth/fmtowns_pc98/towns_audio.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/audio/softsynth/fmtowns_pc98/towns_audio.cpp b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
index 8c08702504..beee5f1cad 100644
--- a/audio/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -1617,10 +1617,7 @@ int TownsAudio_PcmChannel::initInstrument(uint8 &note, TownsAudio_WaveTable *&ta
if (i == 8)
return 8;
- int il = i << 3;
- note += _curInstrument[il + 70];
-
- uint8 *d = &_curInstrument[il + 64];
+ uint8 *d = &_curInstrument[(i << 3) + 64];
_envTotalLevel = d[0];
_envAttackRate = d[1];
_envDecayRate = d[2];
@@ -1822,7 +1819,7 @@ void TownsAudio_PcmChannel::envAttack() {
_envState = kEnvAttacking;
int16 t = _envTotalLevel << 8;
if (_envAttackRate == 127) {
- _envStep = 0;
+ _envCurrentLevel = _envStep = 0;
} else if (_envAttackRate) {
_envStep = t / _envAttackRate;
_envCurrentLevel = 1;