[Scummvm-cvs-logs] SF.net SVN: scummvm: [26062] scummvm/trunk/engines
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Mar 10 16:02:39 CET 2007
Revision: 26062
http://scummvm.svn.sourceforge.net/scummvm/?rev=26062&view=rev
Author: sev
Date: 2007-03-10 07:02:39 -0800 (Sat, 10 Mar 2007)
Log Message:
-----------
Silence MSVC8 warnings.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/disk.cpp
scummvm/trunk/engines/queen/display.cpp
scummvm/trunk/engines/scumm/player_nes.cpp
Modified: scummvm/trunk/engines/parallaction/disk.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk.cpp 2007-03-10 15:00:56 UTC (rev 26061)
+++ scummvm/trunk/engines/parallaction/disk.cpp 2007-03-10 15:02:39 UTC (rev 26062)
@@ -172,7 +172,7 @@
void Disk::loadTalk(const char *name, Cnv *cnv) {
- char* ext = strstr(name, ".talk");
+ const char *ext = strstr(name, ".talk");
if (ext != NULL) {
// npc talk
loadCnv(name, cnv);
Modified: scummvm/trunk/engines/queen/display.cpp
===================================================================
--- scummvm/trunk/engines/queen/display.cpp 2007-03-10 15:00:56 UTC (rev 26061)
+++ scummvm/trunk/engines/queen/display.cpp 2007-03-10 15:02:39 UTC (rev 26062)
@@ -845,7 +845,7 @@
}
void Display::decodeLBM(const uint8 *src, uint32 srcSize, uint8 *dst, uint16 dstPitch, uint16 *w, uint16 *h, uint8 *pal, uint16 palStart, uint16 palEnd, uint8 colorBase) {
- int planeCount, planePitch;
+ int planeCount = 0, planePitch = 0;
const uint8 *srcEnd = src + srcSize;
src += 12;
while (src < srcEnd) {
Modified: scummvm/trunk/engines/scumm/player_nes.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_nes.cpp 2007-03-10 15:00:56 UTC (rev 26061)
+++ scummvm/trunk/engines/scumm/player_nes.cpp 2007-03-10 15:02:39 UTC (rev 26062)
@@ -176,7 +176,7 @@
break;
case 4:
- Enabled = Val;
+ Enabled = (Val != 0);
if (!Enabled)
Timer = 0;
break;
@@ -294,7 +294,7 @@
break;
case 4:
- Enabled = Val;
+ Enabled = (Val != 0);
if (!Enabled)
Timer = 0;
break;
@@ -391,7 +391,7 @@
break;
case 4:
- Enabled = Val;
+ Enabled = (Val != 0);
if (!Enabled)
Timer = 0;
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