[Scummvm-cvs-logs] SF.net SVN: scummvm: [22431] scummvm/trunk/base
h00ligan at users.sourceforge.net
h00ligan at users.sourceforge.net
Sat May 13 01:54:16 CEST 2006
Revision: 22431
Author: h00ligan
Date: 2006-05-13 01:39:12 -0700 (Sat, 13 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22431&view=rev
Log Message:
-----------
fix VS2005 compilation warnings
Modified Paths:
--------------
scummvm/trunk/base/commandLine.cpp
scummvm/trunk/dists/scummvm.rc
scummvm/trunk/engines/gob/music.h
scummvm/trunk/engines/simon/simon.cpp
Modified: scummvm/trunk/base/commandLine.cpp
===================================================================
--- scummvm/trunk/base/commandLine.cpp 2006-05-13 08:24:47 UTC (rev 22430)
+++ scummvm/trunk/base/commandLine.cpp 2006-05-13 08:39:12 UTC (rev 22431)
@@ -292,7 +292,7 @@
// resp. between "--some-option" and "--no-some-option".
#define DO_OPTION_BOOL(shortCmd, longCmd) \
if (isLongCmd ? (!strcmp(s+2, longCmd) || !strcmp(s+2, "no-"longCmd)) : (tolower(s[1]) == shortCmd)) { \
- bool boolValue = islower(s[1]); \
+ bool boolValue = (islower(s[1]) != 0); \
s += 2; \
if (isLongCmd) { \
boolValue = !strcmp(s, longCmd); \
@@ -595,7 +595,7 @@
DetectedGameList candidates(PluginManager::instance().detectGames(files));
bool gameidDiffers = false;
for (DetectedGameList::iterator x = candidates.begin(); x != candidates.end(); ++x) {
- gameidDiffers |= scumm_stricmp(gameid.c_str(), x->gameid.c_str());
+ gameidDiffers |= (scumm_stricmp(gameid.c_str(), x->gameid.c_str()) != 0);
}
if (candidates.empty()) {
Modified: scummvm/trunk/dists/scummvm.rc
===================================================================
--- scummvm/trunk/dists/scummvm.rc 2006-05-13 08:24:47 UTC (rev 22430)
+++ scummvm/trunk/dists/scummvm.rc 2006-05-13 08:39:12 UTC (rev 22431)
@@ -1,9 +1,9 @@
#include "winresrc.h"
-#if defined(_MSC_VER)
+#if defined (__MINGW32__)
+IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
+#else
IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico"
-#else
-IDI_ICON ICON DISCARDABLE "icons/scummvm.ico"
#endif
VS_VERSION_INFO VERSIONINFO
Modified: scummvm/trunk/engines/gob/music.h
===================================================================
--- scummvm/trunk/engines/gob/music.h 2006-05-13 08:24:47 UTC (rev 22430)
+++ scummvm/trunk/engines/gob/music.h 2006-05-13 08:39:12 UTC (rev 22431)
@@ -42,7 +42,7 @@
void lock() { _mutex.lock(); }
void unlock() { _mutex.unlock(); }
bool playing() { return _playing; }
- bool getRepeating(void) { return _repCount; }
+ bool getRepeating(void) { return _repCount != 0; }
void setRepeating (int32 repCount) { _repCount = repCount; }
void startPlay(void);
void stopPlay(void) { _mutex.lock(); _playing = false; _mutex.unlock(); }
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp 2006-05-13 08:24:47 UTC (rev 22430)
+++ scummvm/trunk/engines/simon/simon.cpp 2006-05-13 08:39:12 UTC (rev 22431)
@@ -1301,7 +1301,7 @@
byte *SimonEngine::allocBlock(uint32 size) {
byte *block, *blockEnd;
- int i;
+ uint i;
for (i = 0; i < _vgaMemSize / size; i++) {
block = _vgaMemPtr;
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