[Scummvm-cvs-logs] SF.net SVN: scummvm: [32994] scummvm/trunk
tramboi at users.sourceforge.net
tramboi at users.sourceforge.net
Thu Jul 10 20:01:54 CEST 2008
Revision: 32994
http://scummvm.svn.sourceforge.net/scummvm/?rev=32994&view=rev
Author: tramboi
Date: 2008-07-10 11:01:54 -0700 (Thu, 10 Jul 2008)
Log Message:
-----------
Fixed a few warnings
Modified Paths:
--------------
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/trunk/engines/scumm/detection.cpp
scummvm/trunk/engines/scumm/he/resource_he.cpp
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-07-10 16:37:45 UTC (rev 32993)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2008-07-10 18:01:54 UTC (rev 32994)
@@ -160,13 +160,13 @@
// Ensure we copy using 16 bit quantities due to limitation of VRAM addressing
- u16* image = (u16 *) DS::get8BitBackBuffer();
+ const u16* image = (const u16 *) DS::get8BitBackBuffer();
for (int y = 0; y < DS::getGameHeight(); y++)
{
DC_FlushRange(image + (y << 8), DS::getGameWidth());
for (int x = 0; x < DS::getGameWidth() >> 1; x++)
{
- *(((u16 *) (surf->pixels)) + y * (DS::getGameWidth() >> 1) + x) = image[y << 8 + x];
+ *(((u16 *) (surf->pixels)) + y * (DS::getGameWidth() >> 1) + x) = image[(y << 8) + x];
}
}
@@ -279,7 +279,7 @@
void OSystem_DS::copyRectToOverlay (const OverlayColor *buf, int pitch, int x, int y, int w, int h) {
u16* bg = (u16 *) DS::get16BitBackBuffer();
- u16* src = (u16 *) buf;
+ const u16* src = (const u16 *) buf;
// if (x + w > 256) w = 256 - x;
//if (x + h > 256) h = 256 - y;
Modified: scummvm/trunk/engines/scumm/detection.cpp
===================================================================
--- scummvm/trunk/engines/scumm/detection.cpp 2008-07-10 16:37:45 UTC (rev 32993)
+++ scummvm/trunk/engines/scumm/detection.cpp 2008-07-10 18:01:54 UTC (rev 32994)
@@ -492,7 +492,7 @@
// Note that GF_OLD_BUNDLE is true if and only if GF_OLD256 is false.
// Candidates: maniac enhanced, zak enhanced, indy3ega, loom
- if (g->version != 2 && g->version != 3 || (g->features & GF_OLD256))
+ if ((g->version != 2 && g->version != 3) || (g->features & GF_OLD256))
return false;
/* We distinguish the games by the presence/absence of
Modified: scummvm/trunk/engines/scumm/he/resource_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/resource_he.cpp 2008-07-10 16:37:45 UTC (rev 32993)
+++ scummvm/trunk/engines/scumm/he/resource_he.cpp 2008-07-10 18:01:54 UTC (rev 32994)
@@ -522,12 +522,13 @@
/* get a list of all resources at this level */
wr = list_resources(fi, base, &rescnt);
- if (wr == NULL)
+ if (wr == NULL) {
if (size != 0)
return size;
else
return 0;
-
+ }
+
/* process each resource listed */
for (c = 0 ; c < rescnt ; c++) {
/* (over)write the corresponding WinResource holder with the current */
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