[Scummvm-cvs-logs] SF.net SVN: scummvm:[34076] scummvm/trunk/engines/kyra/sound_towns.cpp

[athrxx at users.sourceforge.net]

Revision: 34076
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34076&view=rev
Author:   athrxx
Date:     2008-08-20 22:38:36 +0000 (Wed, 20 Aug 2008)

Log Message:
-----------
KYRA: Towns/PC-98-Audio: fix bug where pitch wheel is processed twice instead of once

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2008-08-20 21:33:06 UTC (rev 34075)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2008-08-20 22:38:36 UTC (rev 34076)
@@ -2459,8 +2459,6 @@
 		if (!processPitchWheel())
 			return;
 
-		processPitchWheel();
-
 		uint16 f = _frequency >> _block;
 		writeReg(_regOffset << 1, f & 0xff);
 		writeReg((_regOffset << 1) + 1, f >> 8);
@@ -3517,12 +3515,12 @@
 }
 
 void TownsPC98_OpnDriver::setMusicTempo(uint8 tempo) {
-	float spc = (float)(0x100 - tempo) * 10.0 * _baserate;
+	float spc = (float)(0x100 - tempo) * 10.0f * _baserate;
 	_samplesPerMusicCallback = (int32) spc;
 }
 
 void TownsPC98_OpnDriver::setSfxTempo(uint16 tempo) {
-	float spc = (float)(0x400 - tempo) * _baserate;
+	float spc = (float)(0x400 - tempo) * 0.625f * _baserate;
 	_samplesPerSfxCallback = (int32) spc;
 }
 


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