[Scummvm-cvs-logs] SF.net SVN: scummvm: [29850] scummvm/trunk/engines/cine/anim.cpp

[thebluegr at users.sourceforge.net]

Revision: 29850
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29850&view=rev
Author:   thebluegr
Date:     2007-12-13 09:03:14 -0800 (Thu, 13 Dec 2007)

Log Message:
-----------
Fixed an incorrect copy/paste

Modified Paths:
--------------
    scummvm/trunk/engines/cine/anim.cpp

Modified: scummvm/trunk/engines/cine/anim.cpp
===================================================================
--- scummvm/trunk/engines/cine/anim.cpp	2007-12-13 15:10:52 UTC (rev 29849)
+++ scummvm/trunk/engines/cine/anim.cpp	2007-12-13 17:03:14 UTC (rev 29850)
@@ -379,11 +379,12 @@
 
 	if (idx >= 0) {
 		entry = reserveFrame((uint16) partBuffer[foundFileIdx].unpackedSize, 1, 0, idx);
+		memcpy(animDataTable[entry].ptr1, dataPtr, partBuffer[foundFileIdx].unpackedSize);
+	} else {
+		entry = allocFrame((uint16) partBuffer[foundFileIdx].unpackedSize, 1, -1);
 		assert(entry != -1);
 		memcpy(animDataTable[entry].ptr1, dataPtr, (uint16) partBuffer[foundFileIdx].unpackedSize);
-	} else {
-		entry = allocFrame((uint16) partBuffer[foundFileIdx].unpackedSize, 1, -1);
-		memcpy(animDataTable[entry].ptr1, dataPtr, partBuffer[foundFileIdx].unpackedSize);
+
 		animDataTable[entry].fileIdx = foundFileIdx;
 		animDataTable[entry].frameIdx = 0;
 		strcpy(animDataTable[entry].name, currentPartName);


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