[Scummvm-cvs-logs] SF.net SVN: scummvm: [27765] scummvm/trunk/sound/mods/protracker.cpp

[fingolfin at users.sourceforge.net]

Revision: 27765
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27765&view=rev
Author:   fingolfin
Date:     2007-06-28 13:18:56 -0700 (Thu, 28 Jun 2007)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/sound/mods/protracker.cpp

Modified: scummvm/trunk/sound/mods/protracker.cpp
===================================================================
--- scummvm/trunk/sound/mods/protracker.cpp	2007-06-28 20:15:10 UTC (rev 27764)
+++ scummvm/trunk/sound/mods/protracker.cpp	2007-06-28 20:18:56 UTC (rev 27765)
@@ -177,10 +177,10 @@
 		_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 @@
 			}
 		}
 
-		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 @@
 				_track[track].portaToNoteSpeed = exy;
 			break;
 		case 0x4:
-			if (ex || ey) {
+			if (exy) {
 				_track[track].vibratoSpeed = ex;
 				_track[track].vibratoDepth = ey;
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.