From f051fbb9d811d63c20c4a8d1232c877574922b4a Mon Sep 17 00:00:00 2001 From: Joost Peters Date: Fri, 13 Feb 2009 16:55:16 +0000 Subject: Formatting changes / consistency svn-id: r36304 --- engines/sky/music/adlibchannel.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'engines/sky/music/adlibchannel.cpp') diff --git a/engines/sky/music/adlibchannel.cpp b/engines/sky/music/adlibchannel.cpp index 588057a7c8..52c5a397b3 100644 --- a/engines/sky/music/adlibchannel.cpp +++ b/engines/sky/music/adlibchannel.cpp @@ -84,7 +84,6 @@ AdlibChannel::~AdlibChannel(void) { } bool AdlibChannel::isActive(void) { - return _channelData.channelActive; } @@ -97,7 +96,6 @@ void AdlibChannel::updateVolume(uint16 pVolume) { by all instances of the class. */ void AdlibChannel::setRegister(uint8 regNum, uint8 value) { - if (_adlibRegMirror[regNum] != value) { OPLWriteReg (_opl, regNum, value); _adlibRegMirror[regNum] = value; @@ -105,7 +103,6 @@ void AdlibChannel::setRegister(uint8 regNum, uint8 value) { } void AdlibChannel::stopNote(void) { - if (_channelData.note & 0x20) { _channelData.note &= ~0x20; setRegister(0xB0 | _channelData.adlibChannelNumber, _channelData.note); @@ -129,7 +126,6 @@ int32 AdlibChannel::getNextEventTime(void) { } uint8 AdlibChannel::process(uint16 aktTime) { - if (!_channelData.channelActive) { return 0; } @@ -190,7 +186,6 @@ uint8 AdlibChannel::process(uint16 aktTime) { } void AdlibChannel::setupInstrument(uint8 opcode) { - uint16 nextNote; if (_channelData.tremoVibro) { uint8 newInstrument = _instrumentMap[opcode]; @@ -211,7 +206,6 @@ void AdlibChannel::setupInstrument(uint8 opcode) { } void AdlibChannel::setupChannelVolume(uint8 volume) { - uint8 resultOp; uint32 resVol = ((volume + 1) * (_channelData.instrumentData->totOutLev_Op2 + 1)) << 1; resVol &= 0xFFFF; @@ -233,7 +227,6 @@ void AdlibChannel::setupChannelVolume(uint8 volume) { } void AdlibChannel::adlibSetupInstrument(void) { - setRegister(0x60 | _channelData.adlibReg1, _channelData.instrumentData->ad_Op1); setRegister(0x60 | _channelData.adlibReg2, _channelData.instrumentData->ad_Op2); setRegister(0x80 | _channelData.adlibReg1, _channelData.instrumentData->sr_Op1); @@ -246,7 +239,6 @@ void AdlibChannel::adlibSetupInstrument(void) { } uint16 AdlibChannel::getNextNote(uint8 param) { - int16 freqIndex = ((int16)_channelData.freqOffset) - 0x40; if (freqIndex >= 0x3F) freqIndex++; @@ -264,20 +256,17 @@ uint16 AdlibChannel::getNextNote(uint8 param) { //- command 90h routines void AdlibChannel::com90_caseNoteOff(void) { - if (_musicData[_channelData.eventDataPtr] == _channelData.lastCommand) stopNote(); _channelData.eventDataPtr++; } void AdlibChannel::com90_stopChannel(void) { - stopNote(); _channelData.channelActive = false; } void AdlibChannel::com90_setupInstrument(void) { - _channelData.channelVolume = 0x7F; _channelData.freqOffset = 0x40; _channelData.assignedInstrument = _musicData[_channelData.eventDataPtr]; @@ -291,7 +280,6 @@ uint8 AdlibChannel::com90_updateTempo(void) { } void AdlibChannel::com90_getFreqOffset(void) { - _channelData.freqOffset = _musicData[_channelData.eventDataPtr++]; if (_channelData.note & 0x20) { uint16 nextNote = getNextNote( @@ -303,27 +291,22 @@ void AdlibChannel::com90_getFreqOffset(void) { } void AdlibChannel::com90_getChannelVolume(void) { - _channelData.channelVolume = _musicData[_channelData.eventDataPtr++]; } void AdlibChannel::com90_getTremoVibro(void) { - _channelData.tremoVibro = _musicData[_channelData.eventDataPtr++]; } void AdlibChannel::com90_loopMusic(void) { - _channelData.eventDataPtr = _channelData.loopPoint; } void AdlibChannel::com90_keyOff(void) { - stopNote(); } void AdlibChannel::com90_setLoopPoint(void) { - _channelData.loopPoint = _channelData.eventDataPtr; } -- cgit v1.2.3