[Scummvm-cvs-logs] SF.net SVN: scummvm: [29849] scummvm/trunk/engines/cine/anim.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Thu Dec 13 16:10:52 CET 2007
Revision: 29849
http://scummvm.svn.sourceforge.net/scummvm/?rev=29849&view=rev
Author: thebluegr
Date: 2007-12-13 07:10:52 -0800 (Thu, 13 Dec 2007)
Log Message:
-----------
Fixed regression introduced by the latest cleanups
Modified Paths:
--------------
scummvm/trunk/engines/cine/anim.cpp
Modified: scummvm/trunk/engines/cine/anim.cpp
===================================================================
--- scummvm/trunk/engines/cine/anim.cpp 2007-12-13 14:04:36 UTC (rev 29848)
+++ scummvm/trunk/engines/cine/anim.cpp 2007-12-13 15:10:52 UTC (rev 29849)
@@ -380,13 +380,10 @@
if (idx >= 0) {
entry = reserveFrame((uint16) partBuffer[foundFileIdx].unpackedSize, 1, 0, idx);
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, (uint16) partBuffer[foundFileIdx].unpackedSize);
-
- if (idx < 0) {
+ 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.
More information about the Scummvm-git-logs
mailing list