[Scummvm-cvs-logs] SF.net SVN: scummvm:[42810] scummvm/branches/branch-1-0-0/graphics/video/ coktelvideo/coktelvideo.cpp

[drmccoy at users.sourceforge.net]

Revision: 42810
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42810&view=rev
Author:   drmccoy
Date:     2009-07-26 13:50:57 +0000 (Sun, 26 Jul 2009)

Log Message:
-----------
Backport: Reverting my fix for bug #2037158 ("In-Game animation shifted(?)"), because it breaks Woodruff's intro

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp

Modified: scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp	2009-07-26 13:50:18 UTC (rev 42809)
+++ scummvm/branches/branch-1-0-0/graphics/video/coktelvideo/coktelvideo.cpp	2009-07-26 13:50:57 UTC (rev 42810)
@@ -1515,9 +1515,7 @@
 		int16 h = MIN(height, sH);
 
 		for (int i = 0; i < h; i++) {
-			for (int j = 0; j < w; j++)
-				if (srcPtr[j])
-					dest[j] = srcPtr[j];
+			memcpy(dest, srcPtr, w);
 
 			srcPtr += postScaleX(width);
 			dest += sW;


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