- 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

18 files changed, 144 insertions, 33 deletions

diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index 078a5a2d62..cff313cea4 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -35,7 +35,7 @@
 #if !defined(_WIN32_WCE) && !defined(__MAEMO__)
 
 #if defined (WIN32)
-int WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/,  LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
+int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/,  LPSTR /*lpCmdLine*/, int /*iShowCmd*/) {
 	SDL_SetModuleHandle(GetModuleHandle(NULL));
 	return main(__argc, __argv);
 }
@@ -102,7 +102,6 @@ int main(int argc, char *argv[]) {
 }
 #endif
 
-
 void OSystem_SDL::initBackend() {
 	assert(!_inited);
 
diff --git a/base/options.cpp b/base/commandLine.cpp
index e01621af0a..2dec1703f5 100644
--- a/base/options.cpp
+++ b/base/commandLine.cpp
@@ -24,7 +24,7 @@
 #include "common/stdafx.h"
 
 #include "base/engine.h"
-#include "base/options.h"
+#include "base/commandLine.h"
 #include "base/plugins.h"
 #include "base/version.h"
 
diff --git a/base/options.h b/base/commandLine.h
index dbf1776c74..dbf1776c74 100644
--- a/base/options.h
+++ b/base/commandLine.h
diff --git a/base/main.cpp b/base/main.cpp
index c5f646c7a4..292b57afdd 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -32,7 +32,7 @@
 #include "common/stdafx.h"
 #include "backends/fs/fs.h"
 #include "base/engine.h"
-#include "base/options.h"
+#include "base/commandLine.h"
 #include "base/plugins.h"
 #include "base/version.h"
 #include "common/config-manager.h"
diff --git a/base/module.mk b/base/module.mk
index 5af0e1349c..3a515b4f5c 100644
--- a/base/module.mk
+++ b/base/module.mk
@@ -3,7 +3,7 @@ MODULE := base
 MODULE_OBJS := \
 	engine.o \
 	main.o \
-	options.o \
+	commandLine.o \
 	plugins.o \
 	version.o
 
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index f2c29bcbf3..b2b61cab8d 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -191,6 +191,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\draw_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\draw_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\driver_vga.cpp"
 			>
 		</File>
@@ -207,6 +215,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\game_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\game_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\global.cpp"
 			>
 		</File>
@@ -239,6 +255,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\init_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\init_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\inter.cpp"
 			>
 		</File>
@@ -358,6 +382,14 @@
 			RelativePath="..\..\engines\gob\video.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\gob\video_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\video_v2.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index b0de755d4a..c182546aa7 100644
--- a/dists/msvc8/kyra.vcproj
+++ b/dists/msvc8/kyra.vcproj
@@ -191,6 +191,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\plugin.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\resource.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index 0cee3729a5..5120208a32 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -311,6 +311,14 @@
 			Name="he"
 			>
 			<File
+				RelativePath="..\..\engines\scumm\he\animation_he.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\he\animation_he.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\engines\scumm\he\floodfill_he.cpp"
 				>
 			</File>
@@ -418,6 +426,18 @@
 				RelativePath="..\..\engines\scumm\imuse\instrument.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\sysex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\sysex_samnmax.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\engines\scumm\imuse\sysex_scumm.cpp"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath="..\..\engines\scumm\actor.cpp"
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index a7370c198d..6668b5fbf5 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -70,10 +70,10 @@
 				AdditionalDependencies="winmm.lib sdl.lib zdll.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib lure_debug/lure.lib cine_debug/cine.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib"
+				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="1"
+				SubSystem="2"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -161,7 +161,7 @@
 				SuppressStartupBanner="true"
 				IgnoreDefaultLibraryNames="libc.lib"
 				GenerateDebugInformation="false"
-				SubSystem="1"
+				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
@@ -199,6 +199,14 @@
 			Name="base"
 			>
 			<File
+				RelativePath="..\..\base\commandLine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\base\commandLine.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\base\engine.cpp"
 				>
 			</File>
@@ -207,11 +215,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\base\options.cpp"
+				RelativePath="..\..\base\game.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\base\options.h"
+				RelativePath="..\..\base\internal_version.h"
 				>
 			</File>
 			<File
@@ -219,6 +227,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\base\main.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\base\plugins.cpp"
 				>
 			</File>
@@ -227,6 +239,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\base\version.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\base\version.h"
 				>
 			</File>
@@ -275,11 +291,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\list.h"
+				RelativePath="..\..\common\hashmap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\hashmap.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\common\map.h"
+				RelativePath="..\..\common\list.h"
 				>
 			</File>
 			<File
@@ -814,6 +834,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gui\eval.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gui\eval.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gui\Key.cpp"
 				>
 			</File>
@@ -890,6 +918,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gui\theme-config.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gui\theme.cpp"
 				>
 			</File>
@@ -898,6 +930,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gui\ThemeClassic.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gui\ThemeNew.cpp"
 				>
 			</File>
diff --git a/dists/msvc8/simon.vcproj b/dists/msvc8/simon.vcproj
index f5b8b162f7..3c49c31a03 100644
--- a/dists/msvc8/simon.vcproj
+++ b/dists/msvc8/simon.vcproj
@@ -160,6 +160,14 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\simon\animation.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\simon\animation.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\simon\charset.cpp"
 			>
 		</File>
@@ -184,6 +192,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\simon\draw.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\simon\event.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\simon\game.cpp"
 			>
 		</File>
@@ -240,6 +256,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\simon\string.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\simon\subroutine.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\simon\verb.cpp"
 			>
 		</File>
@@ -251,6 +275,10 @@
 			RelativePath="..\..\engines\simon\vga.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\simon\window.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/sword2.vcproj b/dists/msvc8/sword2.vcproj
index f91633e45b..38def46c26 100644
--- a/dists/msvc8/sword2.vcproj
+++ b/dists/msvc8/sword2.vcproj
@@ -187,10 +187,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\d_draw.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\debug.cpp"
 			>
 		</File>
@@ -283,10 +279,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\sword2\rdwin.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\sword2\render.cpp"
 			>
 		</File>
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index a18e4bd76f..e01a69fdd9 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -1,6 +1,6 @@
 #include "winresrc.h"
 
-IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 0,9,0,0
diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 6cc4818be0..8876989c49 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -1,6 +1,6 @@
 #include "winresrc.h"
 
-IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+IDI_ICON               ICON    DISCARDABLE     "../../icons/scummvm.ico"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION @VER_MAJOR@,@VER_MINOR@,@VER_PATCH@,0
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;
diff --git a/graphics/font.cpp b/graphics/font.cpp
index 18379d7e8c..b40f6fc283 100644
--- a/graphics/font.cpp
+++ b/graphics/font.cpp
@@ -172,8 +172,8 @@ NewFontData* bdf_read_font(Common::SeekableReadStream &fp) {
 
 /* read bdf font header information, return 0 on error*/
 int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) {
-	int encoding;
-	int nchars, maxwidth;
+	int encoding = 0;
+	int nchars = 0, maxwidth;
 	int firstchar = 65535;
 	int lastchar = -1;
 	char buf[256];
@@ -308,8 +308,8 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) {
 int bdf_read_bitmaps(Common::SeekableReadStream &fp, NewFontData* pf) {
 	long ofs = 0;
 	int maxwidth = 0;
-	int i, k, encoding, width;
-	int bbw, bbh, bbx, bby;
+	int i, k, encoding = 0, width = 0;
+	int bbw, bbh = 0, bbx = 0, bby = 0;
 	int proportional = 0;
 	int encodetable = 0;
 	long l;
@@ -627,7 +627,7 @@ NewFont *NewFont::loadFromCache(Common::SeekableReadStream &stream) {
 		data->bits[i] = stream.readUint16BE();
 	}
 
-	bool hasOffsetTable = stream.readByte();
+	bool hasOffsetTable = (stream.readByte() != 0);
 	if (hasOffsetTable) {
 		data->offset = (unsigned long*)malloc(sizeof(unsigned long)*data->size);
 		if (!data->offset) {
@@ -641,7 +641,7 @@ NewFont *NewFont::loadFromCache(Common::SeekableReadStream &stream) {
 		}
 	}
 
-	bool hasWidthTable = stream.readByte();
+	bool hasWidthTable = (stream.readByte() != 0);
 	if (hasWidthTable) {
 		data->width = (unsigned char*)malloc(sizeof(unsigned char)*data->size);
 		if (!data->width) {
diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp
index 1487f4491a..15b16b5e45 100644
--- a/sound/audiocd.cpp
+++ b/sound/audiocd.cpp
@@ -31,6 +31,8 @@
 #include "common/util.h"
 #include "common/system.h"
 
+DECLARE_SINGLETON(Audio::AudioCDManager);
+
 namespace Audio {
 
 struct TrackFormat {
@@ -61,8 +63,6 @@ static const TrackFormat TRACK_FORMATS[] = {
 };
 
 
-DECLARE_SINGLETON(AudioCDManager);
-
 AudioCDManager::AudioCDManager() {
 	memset(&_cd, 0, sizeof(_cd));
 	memset(_cachedTracks, 0, sizeof(_cachedTracks));