From c1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3 Mon Sep 17 00:00:00 2001
From: athrxx <athrxx@scummvm.org>
Date: Thu, 2 Jun 2011 16:51:54 +0200
Subject: [PATCH] FM-TOWNS AUDIO: fix regression

---
 audio/softsynth/fmtowns_pc98/towns_audio.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/audio/softsynth/fmtowns_pc98/towns_audio.cpp b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
index 8c087025047..beee5f1cad7 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;