diff options
| author | Max Horn | 2007-06-28 16:39:04 +0000 |
|---|---|---|
| committer | Max Horn | 2007-06-28 16:39:04 +0000 |
| commit | c69fe68112729d8cdf49df195eedf8d7852d95ca (patch) | |
| tree | 11a418a9dd884cdb0ba9c7a566d5e27005b81b3a | |
| parent | 1a7b91b7e2a27b97f044cad7d9ac0f1179a0ace5 (diff) | |
| download | scummvm-rg350-c69fe68112729d8cdf49df195eedf8d7852d95ca.tar.gz scummvm-rg350-c69fe68112729d8cdf49df195eedf8d7852d95ca.tar.bz2 scummvm-rg350-c69fe68112729d8cdf49df195eedf8d7852d95ca.zip | |
Minor cleanup
svn-id: r27758
| -rw-r--r-- | sound/mods/protracker.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/sound/mods/protracker.cpp b/sound/mods/protracker.cpp index beb7d6f262..62a6e1709a 100644 --- a/sound/mods/protracker.cpp +++ b/sound/mods/protracker.cpp @@ -342,26 +342,22 @@ void ProtrackerStream::updateEffects() { for (int track = 0; track < 4; track++) { _track[track].vibrato = 0; - note_t note = + const note_t note = _module.pattern[_module.songpos[_pos]][_row][track]; - int effect = note.effect >> 8; + const int effect = note.effect >> 8; - int exy = note.effect & 0xff; - int ex = (note.effect >> 4) & 0xf; - int ey = (note.effect) & 0xf; + const int exy = note.effect & 0xff; + const int ex = (note.effect >> 4) & 0xf; + const int ey = (note.effect) & 0xf; switch (effect) { case 0x0: - if (ex || ey) { - if (_tick == 1) - _track[track].period = - _module.noteToPeriod(_track[track].arpeggioNotes[0], - _track[track].finetune); - else - _track[track].period = - _module.noteToPeriod(_track[track].arpeggioNotes[_tick % 3], - _track[track].finetune); + if (exy) { + const int idx = (_tick == 1) ? 0 : (_tick % 3); + _track[track].period = + _module.noteToPeriod(_track[track].arpeggioNotes[idx], + _track[track].finetune); } break; case 0x1: @@ -392,7 +388,7 @@ void ProtrackerStream::updateEffects() { case 0x6: break; // Pattern loop case 0x9: // Retrigger note - if (ey && _tick % ey == 0) + if (ey && (_tick % ey) == 0) _track[track].offset = 0.0; break; case 0xD: // Delay sample |