diff options
author | Matt Hargett | 2002-09-22 03:53:53 +0000 |
---|---|---|
committer | Matt Hargett | 2002-09-22 03:53:53 +0000 |
commit | 8390b0cc53b2025108eee9a8ea9ee7f411edd55e (patch) | |
tree | 5ca2452114d38060824e0edee01ce7955132ad37 /common | |
parent | fbe9c544de19cc4a7f28e2dbf1fdebaf351b83ee (diff) | |
download | scummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.tar.gz scummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.tar.bz2 scummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.zip |
2002-09-21 Matt Hargett <matt@use.net>
* scumm.dsp, scummvm.dsp, simon.dsp: Turn on warning as errors. Generate
PDBs on all builds.
* gameDetector.cpp, newgui.cpp, widget.cpp, actor.cpp,
dialogs.cpp, resource.cpp, saveload.cpp, scumm_renderer.cpp:
Fix warnings where possible. One pragma added to eliminate
warning of unknown pragmas.
* string.cpp: If unknown escape sequence, print warning.
svn-id: r4998
Diffstat (limited to 'common')
-rw-r--r-- | common/gameDetector.cpp | 4 | ||||
-rw-r--r-- | common/str.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp index 22b5902e51..ddc3ee7473 100644 --- a/common/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -98,7 +98,7 @@ void GameDetector::updateconfig() _music_volume = scummcfg->getInt("music_volume", _music_volume); - _noSubtitles = scummcfg->getBool("nosubtitles", _noSubtitles); + _noSubtitles = scummcfg->getBool("nosubtitles", _noSubtitles ? true : false); if ((val = scummcfg->get("path"))) _gameDataPath = strdup(val); @@ -193,7 +193,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) case 'n': CHECK_OPTION(); _noSubtitles = (c == 'n'); - scummcfg->setBool("nosubtitles", _noSubtitles); + scummcfg->setBool("nosubtitles", _noSubtitles ? true : false); break; case 'p': HANDLE_OPTION(); diff --git a/common/str.cpp b/common/str.cpp index 85ceb965d4..9390f6ff47 100644 --- a/common/str.cpp +++ b/common/str.cpp @@ -22,6 +22,10 @@ #include "str.h" #include "util.h" +#ifdef _MSC_VER +# pragma warning( disable : 4068 ) // unknown pragmas +#endif + namespace ScummVM { String::String(const char *str) |