[Scummvm-cvs-logs] CVS: scummvm/common gameDetector.cpp,1.7,1.8 str.cpp,1.4,1.5

Matt Hargett matt_hargett at users.sourceforge.net
Sat Sep 21 20:54:03 CEST 2002


Update of /cvsroot/scummvm/scummvm/common
In directory usw-pr-cvs1:/tmp/cvs-serv5874/scummvm/common

Modified Files:
	gameDetector.cpp str.cpp 
Log Message:
2002-09-21  Matt Hargett  <matt at 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.



Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gameDetector.cpp	21 Sep 2002 13:48:01 -0000	1.7
+++ gameDetector.cpp	22 Sep 2002 03:53:52 -0000	1.8
@@ -98,7 +98,7 @@
 
 	_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 @@
 			case 'n':
 				CHECK_OPTION();
 				_noSubtitles = (c == 'n');
-				scummcfg->setBool("nosubtitles", _noSubtitles);
+				scummcfg->setBool("nosubtitles", _noSubtitles ? true : false);
 				break;
 			case 'p':
 				HANDLE_OPTION();

Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- str.cpp	15 Sep 2002 09:06:02 -0000	1.4
+++ str.cpp	22 Sep 2002 03:53:52 -0000	1.5
@@ -21,6 +21,10 @@
 #include "stdafx.h"
 #include "str.h"
 #include "util.h"
+
+#ifdef _MSC_VER
+#	pragma warning( disable : 4068 ) // unknown pragmas
+#endif
 
 namespace ScummVM {
 





More information about the Scummvm-git-logs mailing list