diff options
| author | Johannes Schickel | 2010-01-01 22:33:45 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-01-01 22:33:45 +0000 |
| commit | 8817d6eeb5990a3eae1ce93b7ea1e6605a0868e0 (patch) | |
| tree | acd63b2b8675b11782105c06660ee64a17b7ddea /engines/kyra/sound_adlib.cpp | |
| parent | 82b4b65bdc3f67fe97a0f9ae5af0c43a03039c0e (diff) | |
| download | scummvm-rg350-8817d6eeb5990a3eae1ce93b7ea1e6605a0868e0.tar.gz scummvm-rg350-8817d6eeb5990a3eae1ce93b7ea1e6605a0868e0.tar.bz2 scummvm-rg350-8817d6eeb5990a3eae1ce93b7ea1e6605a0868e0.zip | |
Merge update_nop1 and update_nop2.
svn-id: r46860
Diffstat (limited to 'engines/kyra/sound_adlib.cpp')
| -rw-r--r-- | engines/kyra/sound_adlib.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/engines/kyra/sound_adlib.cpp b/engines/kyra/sound_adlib.cpp index bc1e31e324..f2352b4983 100644 --- a/engines/kyra/sound_adlib.cpp +++ b/engines/kyra/sound_adlib.cpp @@ -301,11 +301,10 @@ private: int update_removePrimaryEffect2(uint8 *&dataptr, Channel &channel, uint8 value); int updateCallback41(uint8 *&dataptr, Channel &channel, uint8 value); int update_resetToGlobalTempo(uint8 *&dataptr, Channel &channel, uint8 value); - int update_nop1(uint8 *&dataptr, Channel &channel, uint8 value); + int update_nop(uint8 *&dataptr, Channel &channel, uint8 value); int update_setDurationRandomness(uint8 *&dataptr, Channel &channel, uint8 value); int update_changeChannelTempo(uint8 *&dataptr, Channel &channel, uint8 value); int updateCallback46(uint8 *&dataptr, Channel &channel, uint8 value); - int update_nop2(uint8 *&dataptr, Channel &channel, uint8 value); int update_setupRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value); int update_playRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value); int update_removeRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value); @@ -1655,7 +1654,7 @@ int AdlibDriver::update_resetToGlobalTempo(uint8 *&dataptr, Channel &channel, ui return 0; } -int AdlibDriver::update_nop1(uint8 *&dataptr, Channel &channel, uint8 value) { +int AdlibDriver::update_nop(uint8 *&dataptr, Channel &channel, uint8 value) { --dataptr; return 0; } @@ -1688,14 +1687,6 @@ int AdlibDriver::updateCallback46(uint8 *&dataptr, Channel &channel, uint8 value return 0; } -// TODO: This is really the same as update_nop1(), so they should be combined -// into one single update_nop(). - -int AdlibDriver::update_nop2(uint8 *&dataptr, Channel &channel, uint8 value) { - --dataptr; - return 0; -} - int AdlibDriver::update_setupRhythmSection(uint8 *&dataptr, Channel &channel, uint8 value) { int channelBackUp = _curChannel; int regOffsetBackUp = _curRegOffset; @@ -2031,7 +2022,7 @@ void AdlibDriver::setupParserOpcodeTable() { COMMAND(update_stopChannel), COMMAND(updateCallback41), COMMAND(update_resetToGlobalTempo), - COMMAND(update_nop1), + COMMAND(update_nop), // 60 COMMAND(update_setDurationRandomness), @@ -2040,7 +2031,7 @@ void AdlibDriver::setupParserOpcodeTable() { COMMAND(updateCallback46), // 64 - COMMAND(update_nop2), + COMMAND(update_nop), COMMAND(update_setupRhythmSection), COMMAND(update_playRhythmSection), COMMAND(update_removeRhythmSection), |