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

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sat Jan 27 18:53:57 CET 2007


Revision: 25227
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25227&view=rev
Author:   drmccoy
Date:     2007-01-27 09:53:56 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
Ooops

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

Modified: scummvm/trunk/sound/mods/protracker.cpp
===================================================================
--- scummvm/trunk/sound/mods/protracker.cpp	2007-01-27 17:32:54 UTC (rev 25226)
+++ scummvm/trunk/sound/mods/protracker.cpp	2007-01-27 17:53:56 UTC (rev 25227)
@@ -124,11 +124,11 @@
 
 		int effect = note.effect >> 8;
 
-		_track[track].sample = note.sample;
-		if (_track[track].sample != note.sample) {
-			_track[track].vibratoPos = 0;
-		}
 		if (note.sample) {
+			if (_track[track].sample != note.sample) {
+				_track[track].vibratoPos = 0;
+			}
+			_track[track].sample = note.sample;
 			_track[track].vol = _module->sample[note.sample - 1].vol;
 		}
 		if (note.period) {
@@ -203,7 +203,7 @@
 				_speed = exy;
 			} else {
 				_bpm = exy;
-				setInterruptFreq((int) (((double) _bpm) * 0.4));
+				setInterruptFreq((int) (getRate() / (_bpm * 0.4)));
 			}
 			break;
 		default:


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




More information about the Scummvm-git-logs mailing list