From 1a3724b59b4c89411c748fd3b645a627b4f599cd Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 28 Jun 2007 20:18:56 +0000
Subject: cleanup

svn-id: r27765
---
 sound/mods/protracker.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'sound/mods')

diff --git a/sound/mods/protracker.cpp b/sound/mods/protracker.cpp
index bd1e48ead7..102c265ce9 100644
--- a/sound/mods/protracker.cpp
+++ b/sound/mods/protracker.cpp
@@ -177,10 +177,10 @@ void ProtrackerStream::updateRow() {
 		_track[track].arpeggio = false;
 		_track[track].vibrato = 0;
 		_track[track].delaySampleTick = 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;
 
 		if (note.sample) {
 			if (_track[track].sample != note.sample) {
@@ -201,15 +201,14 @@ void ProtrackerStream::updateRow() {
 			}
 		}
 
-		int exy = note.effect & 0xff;
-		if (exy);
-		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;
 
 		int vol;
 		switch (effect) {
 		case 0x0:
-			if (ex || ey) {
+			if (exy) {
 				_track[track].arpeggio = true;
 				if (note.period) {
 					_track[track].arpeggioNotes[0] = note.note;
@@ -229,7 +228,7 @@ void ProtrackerStream::updateRow() {
 				_track[track].portaToNoteSpeed = exy;
 			break;
 		case 0x4:
-			if (ex || ey) {
+			if (exy) {
 				_track[track].vibratoSpeed = ex;
 				_track[track].vibratoDepth = ey;
 			}
-- 
cgit v1.2.3