[Scummvm-cvs-logs] SF.net SVN: scummvm: [24204] scummvm/trunk

[joostp at users.sourceforge.net]

Revision: 24204
          http://svn.sourceforge.net/scummvm/?rev=24204&view=rev
Author:   joostp
Date:     2006-10-08 05:31:05 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
commit "fixed regression in BASS adlib music." from 0-9-0 branch to trunk

Modified Paths:
--------------
    scummvm/trunk/NEWS
    scummvm/trunk/engines/sky/music/adlibchannel.cpp

Modified: scummvm/trunk/NEWS
===================================================================
--- scummvm/trunk/NEWS	2006-10-08 12:28:33 UTC (rev 24203)
+++ scummvm/trunk/NEWS	2006-10-08 12:31:05 UTC (rev 24204)
@@ -44,6 +44,7 @@
 
  BASS:
    - Fixed character spacing in LINC terminals in floppy version v0.0303
+   - Fixed a regression which caused incorrect adlib music emulation
 
  Broken Sword 1:
    - Fixed speech-related crashes.

Modified: scummvm/trunk/engines/sky/music/adlibchannel.cpp
===================================================================
--- scummvm/trunk/engines/sky/music/adlibchannel.cpp	2006-10-08 12:28:33 UTC (rev 24203)
+++ scummvm/trunk/engines/sky/music/adlibchannel.cpp	2006-10-08 12:31:05 UTC (rev 24204)
@@ -85,8 +85,10 @@
 }
 
 void AdlibChannel::updateVolume(uint16 pVolume) {
-
-	_musicVolume = pVolume * 3;
+	pVolume = (pVolume * 3) >> 1;
+	if (pVolume > 0x7F)
+		pVolume = 0x7F;
+	_musicVolume = pVolume | 128;
 }
 
 /*	This class uses the same area for the register mirror as the original


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