[Scummvm-cvs-logs] SF.net SVN: scummvm:[33204] scummvm/branches/branch-0-12-0/engines/cine/ various.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Jul 22 16:40:25 CEST 2008
Revision: 33204
http://scummvm.svn.sourceforge.net/scummvm/?rev=33204&view=rev
Author: fingolfin
Date: 2008-07-22 14:40:24 +0000 (Tue, 22 Jul 2008)
Log Message:
-----------
Backport CINE warning fixes
Modified Paths:
--------------
scummvm/branches/branch-0-12-0/engines/cine/various.cpp
Modified: scummvm/branches/branch-0-12-0/engines/cine/various.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/cine/various.cpp 2008-07-22 14:39:26 UTC (rev 33203)
+++ scummvm/branches/branch-0-12-0/engines/cine/various.cpp 2008-07-22 14:40:24 UTC (rev 33204)
@@ -265,7 +265,7 @@
static const uint animEntriesCount = 255;
static const uint oldAnimEntrySize = 23;
static const uint newAnimEntrySize = 30;
- static const uint defaultAnimEntrySize = newAnimEntrySize;
+// static const uint defaultAnimEntrySize = newAnimEntrySize;
static const uint animEntrySizeChoices[] = {oldAnimEntrySize, newAnimEntrySize};
Common::Array<uint> animEntrySizeMatches;
const uint32 prevStreamPos = fHandle.pos();
@@ -338,7 +338,7 @@
fHandle.seek(animDataTableStart + i * animEntrySize + relativeDataPos);
uint32 data = fHandle.readUint32BE();
uint32 mask = fHandle.readUint32BE();
- if (data != NULL || mask != NULL) {
+ if ((data != 0) || (mask != 0)) {
pointersIntact = true;
break;
}
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