From d2546e397934da3e89fdd994e0c620dd0bcfbcd4 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 9 May 2006 14:16:43 +0000
Subject: - 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
---
 engines/scumm/charset.cpp | 2 +-
 engines/scumm/script.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/scumm')

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
-- 
cgit v1.2.3