[Scummvm-cvs-logs] scummvm master -> c1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3
athrxx
athrxx at scummvm.org
Thu Jun 2 16:58:01 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c1f00b1e8b FM-TOWNS AUDIO: fix regression
Commit: c1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3
https://github.com/scummvm/scummvm/commit/c1f00b1e8b0e868ba97a9154d2d7c2986d5d9be3
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-02T07:56:01-07:00
Commit Message:
FM-TOWNS AUDIO: fix regression
Changed paths:
audio/softsynth/fmtowns_pc98/towns_audio.cpp
diff --git a/audio/softsynth/fmtowns_pc98/towns_audio.cpp b/audio/softsynth/fmtowns_pc98/towns_audio.cpp
index 8c08702..beee5f1 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 ¬e, 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;
More information about the Scummvm-git-logs
mailing list