diff options
| author | Andrew Kurushin | 2006-05-13 08:39:12 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2006-05-13 08:39:12 +0000 |
| commit | 45b249ee6012772179efe556f92de74163235aea (patch) | |
| tree | 0b4b284518c25cbe20249c4cc93992cb8b5021b5 | |
| parent | 9baf8a72f937b827be0cb5760b78b80ed1aa4127 (diff) | |
| download | scummvm-rg350-45b249ee6012772179efe556f92de74163235aea.tar.gz scummvm-rg350-45b249ee6012772179efe556f92de74163235aea.tar.bz2 scummvm-rg350-45b249ee6012772179efe556f92de74163235aea.zip | |
fix VS2005 compilation warnings
svn-id: r22431
| -rw-r--r-- | base/commandLine.cpp | 4 | ||||
| -rw-r--r-- | dists/scummvm.rc | 6 | ||||
| -rw-r--r-- | engines/gob/music.h | 2 | ||||
| -rw-r--r-- | engines/simon/simon.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 2dec1703f5..2d63a8f210 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -292,7 +292,7 @@ void registerDefaults() { // 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 @@ static void runDetectorTest() { 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()) { diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 1752bb2f6e..14b5fc23de 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -1,9 +1,9 @@ #include "winresrc.h" -#if defined(_MSC_VER) -IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico" -#else +#if defined (__MINGW32__) IDI_ICON ICON DISCARDABLE "icons/scummvm.ico" +#else +IDI_ICON ICON DISCARDABLE "../../icons/scummvm.ico" #endif VS_VERSION_INFO VERSIONINFO diff --git a/engines/gob/music.h b/engines/gob/music.h index 19c7b2d28f..d736bc9ff5 100644 --- a/engines/gob/music.h +++ b/engines/gob/music.h @@ -42,7 +42,7 @@ public: 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(); } diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index fc1b432ce6..b8c69a41d0 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -1301,7 +1301,7 @@ void SimonEngine::setZoneBuffers() { byte *SimonEngine::allocBlock(uint32 size) { byte *block, *blockEnd; - int i; + uint i; for (i = 0; i < _vgaMemSize / size; i++) { block = _vgaMemPtr; |