[Scummvm-cvs-logs] SF.net SVN: scummvm: [30803] scummvm/trunk/engines/sword2/music.cpp

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Tue Feb 5 22:39:30 CET 2008


Revision: 30803
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30803&view=rev
Author:   eriktorbjorn
Date:     2008-02-05 13:39:29 -0800 (Tue, 05 Feb 2008)

Log Message:
-----------
I think this is slightly easier to read...

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/music.cpp

Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp	2008-02-05 15:36:42 UTC (rev 30802)
+++ scummvm/trunk/engines/sword2/music.cpp	2008-02-05 21:39:29 UTC (rev 30803)
@@ -172,9 +172,9 @@
 // Custom AudioStream class to handle Broken Sword 2's audio compression.
 // ----------------------------------------------------------------------------
 
-#define GetCompressedShift(n)      ((n) >> 4)
-#define GetCompressedSign(n)       (((n) >> 3) & 1)
-#define GetCompressedAmplitude(n)  ((n) & 7)
+#define GetCompressedShift(n)      (((n) >> 4) & 0x0F)
+#define GetCompressedSign(n)       ((n) & 0x08)
+#define GetCompressedAmplitude(n)  ((n) & 0x07)
 
 CLUInputStream::CLUInputStream(Common::File *file, int size)
 	: _file(file), _firstTime(true), _bufferEnd(_outbuf + BUFFER_SIZE) {
@@ -236,7 +236,7 @@
 			in++;
 		}
 
-		*out++ = sample;
+		*out++ = (int16)sample;
 	}
 
 	_pos = _outbuf;


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