- Updated MSVC8 project files

- Renamed base/options.cpp to base/commandLine.cpp because of conflict
  with gui/options.cpp which sit in same directory in MSVC builds
- Moved AudioCDManager singleton declaration outside of Audio namespace
- Fixed numerous MSVC warning of potentially uninitialized variables and
  int <-> bool conversions.

svn-id: r22397

3 files changed, 3 insertions, 3 deletions

diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 44c0074760..e38fbf5934 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -1201,7 +1201,7 @@ void CharsetRendererCommon::enableShadow(bool enable) {
 
 void CharsetRendererV3::printChar(int chr, bool ignoreCharsetMask) {
 	// Indy3 / Zak256 / Loom
-	int width, height, origWidth, origHeight;
+	int width, height, origWidth = 0, origHeight;
 	VirtScreen *vs;
 	byte *charPtr, *dst;
 	int is2byte = (chr >= 0x80 && _vm->_useCJKMode) ? 1 : 0;
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 686e6262db..fa014a4465 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -606,7 +606,7 @@ void ScummEngine::writeVar(uint var, int value) {
 			if (_game.heversion <= 73 && vm.slot[_currentScript].number == 1)
 				return;
 			assert(value == 0 || value == 1);
-			ConfMan.setBool("subtitles", value);
+			ConfMan.setBool("subtitles", (value != 0));
 		}
 		if (VAR_NOSUBTITLES != 0xFF && var == VAR_NOSUBTITLES) {
 			// Ignore default setting in HE60-71 games
diff --git a/engines/simon/oracle.cpp b/engines/simon/oracle.cpp
index e159d55e57..8e90befff1 100644
--- a/engines/simon/oracle.cpp
+++ b/engines/simon/oracle.cpp
@@ -386,7 +386,7 @@ void SimonEngine::saveUserGame(int slot) {
 		}
 		if (_keyPressed == 10 || _keyPressed == 13) {
 			if (!saveGame(readVariable(55), name))
-				_variableArray[55] = 0xFFFF;
+				_variableArray[55] = (int16)0xFFFF;
 			else
 				_variableArray[55] = 0;
 			break;