From a07908a00104386f7c2df44142630d556a97e8fe Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 21 Aug 2011 22:00:22 +0200 Subject: SCUMM: Fix typo in PC Speaker output. --- engines/scumm/imuse/pcspk.cpp | 6 +++--- engines/scumm/imuse/pcspk.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/imuse/pcspk.cpp b/engines/scumm/imuse/pcspk.cpp index 668defefba..cbf3446f10 100644 --- a/engines/scumm/imuse/pcspk.cpp +++ b/engines/scumm/imuse/pcspk.cpp @@ -380,7 +380,7 @@ int16 PcSpkDriver::getEffectModLevel(int16 level, int8 mod) { } } -int16 PcSpkDriver::getRandMultipy(int16 input) { +int16 PcSpkDriver::getRandScale(int16 input) { if (_randBase & 1) _randBase = (_randBase >> 1) ^ 0xB8; else @@ -470,7 +470,7 @@ void PcSpkDriver::initNextEnvelopeState(EffectEnvelope &env) { uint16 stepCount = _effectEnvStepTable[getEffectModifier(((env.stateTargetLevels[lastState] & 0x7F) << 5) + env.modWheelSensitivity)]; if (env.stateTargetLevels[lastState] & 0x80) - stepCount = getRandMultipy(stepCount); + stepCount = getRandScale(stepCount); if (!stepCount) stepCount = 1; @@ -480,7 +480,7 @@ void PcSpkDriver::initNextEnvelopeState(EffectEnvelope &env) { if (lastState != 2) { totalChange = getEffectModLevel(env.maxLevel, (env.stateModWheelLevels[lastState] & 0x7F) - 31); if (env.stateModWheelLevels[lastState] & 0x80) - totalChange = getRandMultipy(totalChange); + totalChange = getRandScale(totalChange); if (totalChange + env.startLevel > env.maxLevel) totalChange = env.maxLevel - env.startLevel; diff --git a/engines/scumm/imuse/pcspk.h b/engines/scumm/imuse/pcspk.h index b87110c412..195bd34b07 100644 --- a/engines/scumm/imuse/pcspk.h +++ b/engines/scumm/imuse/pcspk.h @@ -57,7 +57,7 @@ private: static uint8 getEffectModifier(uint16 level); int16 getEffectModLevel(int16 level, int8 mod); - int16 getRandMultipy(int16 input); + int16 getRandScale(int16 input); struct EffectEnvelope { uint8 state; -- cgit v1.2.3