[Scummvm-cvs-logs] SF.net SVN: scummvm:[35435] scummvm/trunk/graphics/smk_player.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Fri Dec 19 09:22:25 CET 2008


Revision: 35435
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35435&view=rev
Author:   thebluegr
Date:     2008-12-19 08:22:25 +0000 (Fri, 19 Dec 2008)

Log Message:
-----------
Some slight cleanup

Modified Paths:
--------------
    scummvm/trunk/graphics/smk_player.cpp

Modified: scummvm/trunk/graphics/smk_player.cpp
===================================================================
--- scummvm/trunk/graphics/smk_player.cpp	2008-12-19 07:32:08 UTC (rev 35434)
+++ scummvm/trunk/graphics/smk_player.cpp	2008-12-19 08:22:25 UTC (rev 35435)
@@ -799,28 +799,18 @@
 		if (!is16Bits) {
 
 			for (int k = 0; k < (isStereo ? 2 : 1); k++) {
-				int8 v = (int8) ((int16) audioTrees[k]->getCode(audioBS));
-
-				bases[k] += v;
-
-				byte data = CLIP<int>(bases[k], 0, 255);
-
-				*curPointer++ = data ^ 0x80;
+				bases[k] += (int8) ((int16) audioTrees[k]->getCode(audioBS));
+				*curPointer++ = CLIP<int>(bases[k], 0, 255) ^ 0x80;
 				curPos++;
 			}
 
 		} else {
 
 			for (int k = 0; k < (isStereo ? 2 : 1); k++) {
-				int16 v = (int16) (audioTrees[k * 2]->getCode(audioBS) |
-				                  (audioTrees[k * 2 + 1]->getCode(audioBS) << 8));
+				bases[k] += (int16) (audioTrees[k * 2]->getCode(audioBS) |
+				                    (audioTrees[k * 2 + 1]->getCode(audioBS) << 8));
 
-				bases[k] += v;
-
-				int16 data = CLIP<int32>(bases[k], -32768, 32767);
-
-				WRITE_BE_UINT16(curPointer, data);
-
+				WRITE_BE_UINT16(curPointer, CLIP<int32>(bases[k], -32768, 32767));
 				curPointer += 2;
 				curPos += 2;
 			}


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