added vc7 files and fixed warnings. vc6 is no longer supported by me

svn-id: r9077

9 files changed, 1810 insertions, 18 deletions

diff --git a/scumm.vcproj b/scumm.vcproj
new file mode 100644
index 0000000000..1868081c66
--- /dev/null
+++ b/scumm.vcproj
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="scumm"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="mad mp3 Debug|Win32"
+			OutputDirectory=".\scumm___mad_mp3_Debug"
+			IntermediateDirectory=".\scumm___mad_mp3_Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\scumm___mad_mp3_Debug/scumm.pch"
+				AssemblerListingLocation=".\scumm___mad_mp3_Debug/"
+				ObjectFile=".\scumm___mad_mp3_Debug/"
+				ProgramDataBaseFileName=".\scumm___mad_mp3_Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\scumm___mad_mp3_Debug\scumm.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="mad mp3 Release|Win32"
+			OutputDirectory=".\scumm___mad_mp3_Release"
+			IntermediateDirectory=".\scumm___mad_mp3_Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\scumm___mad_mp3_Release/scumm.pch"
+				AssemblerListingLocation=".\scumm___mad_mp3_Release/"
+				ObjectFile=".\scumm___mad_mp3_Release/"
+				ProgramDataBaseFileName=".\scumm___mad_mp3_Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\scumm___mad_mp3_Release\scumm.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\scumm___Release"
+			IntermediateDirectory=".\scumm___Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\scumm___Release/scumm.pch"
+				AssemblerListingLocation=".\scumm___Release/"
+				ObjectFile=".\scumm___Release/"
+				ProgramDataBaseFileName=".\scumm___Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\scumm___Release\scumm.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\scumm___Debug"
+			IntermediateDirectory=".\scumm___Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,BYPASS_COPY_PROT,USE_ADLIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\scumm___Debug/scumm.pch"
+				AssemblerListingLocation=".\scumm___Debug/"
+				ObjectFile=".\scumm___Debug/"
+				ProgramDataBaseFileName=".\scumm___Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\scumm___Debug\scumm.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath=".\scumm\actor.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\actor.h">
+			</File>
+			<File
+				RelativePath=".\scumm\akos.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\akos.h">
+			</File>
+			<File
+				RelativePath=".\scumm\base-costume.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\base-costume.h">
+			</File>
+			<File
+				RelativePath=".\scumm\bomp.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\bomp.h">
+			</File>
+			<File
+				RelativePath=".\scumm\boxes.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\boxes.h">
+			</File>
+			<File
+				RelativePath=".\scumm\bundle.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\bundle.h">
+			</File>
+			<File
+				RelativePath=".\scumm\camera.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\charset.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\charset.h">
+			</File>
+			<File
+				RelativePath=".\scumm\costume.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\costume.h">
+			</File>
+			<File
+				RelativePath=".\scumm\debugger.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\debugger.h">
+			</File>
+			<File
+				RelativePath=".\scumm\dialogs.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\dialogs.h">
+			</File>
+			<File
+				RelativePath=".\scumm\gfx.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\gfx.h">
+			</File>
+			<File
+				RelativePath=".\scumm\help.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\help.h">
+			</File>
+			<File
+				RelativePath=".\scumm\imuse.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\imuse.h">
+			</File>
+			<File
+				RelativePath=".\scumm\imuse_digi.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\imuse_digi.h">
+			</File>
+			<File
+				RelativePath=".\scumm\imuse_internal.h">
+			</File>
+			<File
+				RelativePath=".\scumm\imuse_player.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\instrument.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\instrument.h">
+			</File>
+			<File
+				RelativePath=".\scumm\intern.h">
+			</File>
+			<File
+				RelativePath=".\scumm\nut_renderer.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\nut_renderer.h">
+			</File>
+			<File
+				RelativePath=".\scumm\object.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\object.h">
+			</File>
+			<File
+				RelativePath=".\scumm\player_v2.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\player_v2.h">
+			</File>
+			<File
+				RelativePath=".\scumm\resource.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\resource.h">
+			</File>
+			<File
+				RelativePath=".\scumm\resource_v2.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\resource_v3.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\resource_v4.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\saveload.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\saveload.h">
+			</File>
+			<File
+				RelativePath=".\scumm\script.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\script_v2.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\script_v5.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\script_v6.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\script_v8.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\scumm.h">
+			</File>
+			<File
+				RelativePath=".\scumm\scummvm.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\sound.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\sound.h">
+			</File>
+			<File
+				RelativePath=".\scumm\string.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\usage_bits.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\usage_bits.h">
+			</File>
+			<File
+				RelativePath=".\scumm\vars.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\verbs.cpp">
+			</File>
+			<File
+				RelativePath=".\scumm\verbs.h">
+			</File>
+			<Filter
+				Name="smush"
+				Filter="">
+				<File
+					RelativePath=".\scumm\smush\channel.h">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\chunk.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\chunk.h">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\chunk_type.h">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\codec1.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\codec37.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\codec37.h">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\codec47.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\codec47.h">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\imuse_channel.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\saud_channel.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\smush_font.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\smush_font.h">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\smush_mixer.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\smush_mixer.h">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\smush_player.cpp">
+				</File>
+				<File
+					RelativePath=".\scumm\smush\smush_player.h">
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/scumm/bundle.cpp b/scumm/bundle.cpp
index f79245b7e7..2f4ab2f487 100644
--- a/scumm/bundle.cpp
+++ b/scumm/bundle.cpp
@@ -874,7 +874,7 @@ int32 Bundle::decompressCodec(int32 codec, byte *comp_input, byte *comp_output,
 
 				while (left--) {
 					curTableEntry = _destImcTable[curTablePos];
-					decompTable = curTableEntry - 2;
+					decompTable = (byte)(curTableEntry - 2);
 					bitMask = 2 << decompTable;
 					readPos = src + (tableEntrySum >> 3);
 					
diff --git a/scumm/resource.cpp b/scumm/resource.cpp
index a9ec2a8401..9100f9a83f 100644
--- a/scumm/resource.cpp
+++ b/scumm/resource.cpp
@@ -1141,10 +1141,10 @@ int Scumm::readSoundResourceSmallHeader(int type, int idx) {
 		*ptr++ = 480 & 0xFF;
 
 		memcpy(ptr, "MTrk", 4); ptr += 4;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7) >> 24) & 0xFF;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7) >> 16) & 0xFF;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7) >>  8) & 0xFF;
-		*ptr++ = ((sizeof(OLD256_MIDI_HACK) + size + 7)      ) & 0xFF;
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7) >> 24) & 0xFF);
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7) >> 16) & 0xFF);
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7) >>  8) & 0xFF);
+		*ptr++ = (byte)(((sizeof(OLD256_MIDI_HACK) + size + 7)      ) & 0xFF);
 
 		// Conver the ticks into a MIDI tempo. 
 		dw = (500000 * 256) / ticks;
diff --git a/scumm/smush/codec47.cpp b/scumm/smush/codec47.cpp
index 5519dca5a1..ec43bfa36d 100644
--- a/scumm/smush/codec47.cpp
+++ b/scumm/smush/codec47.cpp
@@ -437,7 +437,7 @@ void Codec47Decoder::makeTables47(int32 width) {
 	int16 *tmp_ptr = _table;
 	int16 *ptr_table = codec47_table;
 	do {
-		*tmp_ptr++ = ptr_table[1] * width + ptr_table[0];
+		*tmp_ptr++ = (int16)(ptr_table[1] * width + ptr_table[0]);
 		ptr_table += 2;
 	} while (tmp_ptr < &_table[255]);
 	a = 0;
@@ -445,25 +445,25 @@ void Codec47Decoder::makeTables47(int32 width) {
 	do {
 		for (d = 0; d < _tableSmall[96 + c]; d++) {
 			tmp = _tableSmall[64 + c + d];
-			tmp = (byte)(tmp >> 2) * width + (tmp & 3);
+			tmp = (int16)((byte)(tmp >> 2) * width + (tmp & 3));
 			_tableSmall[c + d * 2] = (byte)tmp;
 			_tableSmall[c + d * 2 + 1] = tmp >> 8;
 		}
 		for (d = 0; d < _tableSmall[97 + c]; d++) {
 			tmp = _tableSmall[80 + c + d];
-			tmp = (byte)(tmp >> 2) * width + (tmp & 3);
+			tmp = (int16)((byte)(tmp >> 2) * width + (tmp & 3));
 			_tableSmall[32 + c + d * 2] = (byte)tmp;
 			_tableSmall[32 + c + d * 2 + 1] = tmp >> 8;
 		}
 		for (d = 0; d < _tableBig[384 + a]; d++) {
 			tmp = _tableBig[256 + a + d];
-			tmp = (byte)(tmp >> 3) * width + (tmp & 7);
+			tmp = (int16)((byte)(tmp >> 3) * width + (tmp & 7));
 			_tableBig[a + d * 2] = (byte)tmp;
 			_tableBig[a + d * 2 + 1] = tmp >> 8;
 		}
 		for (d = 0; d < _tableBig[385 + a]; d++) {
 			tmp = _tableBig[320 + a + d];
-			tmp = (byte)(tmp >> 3) * width + (tmp & 7);
+			tmp = (int16)((byte)(tmp >> 3) * width + (tmp & 7));
 			_tableBig[128 + a + d * 2] = (byte)tmp;
 			_tableBig[128 + a + d * 2 + 1] = tmp >> 8;
 		}
diff --git a/scumm/smush/saud_channel.cpp b/scumm/smush/saud_channel.cpp
index 142ab9a17a..9deb5ce2f3 100644
--- a/scumm/smush/saud_channel.cpp
+++ b/scumm/smush/saud_channel.cpp
@@ -178,14 +178,14 @@ bool SaudChannel::isTerminated() const {
 }
 
 void SaudChannel::recalcVolumeTable() {
-	const int32 MAX_BALANCE = 100;
-	int32 volume_left, volume_right;
+	const int MAX_BALANCE = 100;
+	int volume_left, volume_right;
 	if (_balance < -MAX_BALANCE || _balance > MAX_BALANCE) {
 		warning("balance is out of range ! : %d", _balance);
 		return;
 	}
-	int32 left_multiplier = MAX_BALANCE - _balance;
-	int32 right_multiplier = MAX_BALANCE + _balance;
+	int left_multiplier = MAX_BALANCE - _balance;
+	int right_multiplier = MAX_BALANCE + _balance;
 	volume_left = _volume * left_multiplier / (MAX_BALANCE * 2);
 	volume_right = _volume * right_multiplier / (MAX_BALANCE * 2);
 	if (volume_left < 0)
@@ -196,10 +196,10 @@ void SaudChannel::recalcVolumeTable() {
 		volume_right = 0;
 	if (volume_right > 128)
 		volume_right = 128;
-	for (int32 i = 0; i < 256; i++) {
-		int16 value = volume_left * (int8)i;
+	for (int i = 0; i < 256; i++) {
+		int16 value = volume_left * i;
 		_voltable[0][i] = TO_BE_16(value);
-		value = volume_right * (int8)i;
+		value = volume_right * i;
 		_voltable[1][i] = TO_BE_16(value);
 	}
 }
diff --git a/scumm/string.cpp b/scumm/string.cpp
index 167d3e4ea2..670465345d 100644
--- a/scumm/string.cpp
+++ b/scumm/string.cpp
@@ -101,7 +101,7 @@ void Scumm::CHARSET_1() {
 
 			if (VAR(VAR_V5_TALK_STRING_Y) < 0) {
 				s = (a->scaley * (int)VAR(VAR_V5_TALK_STRING_Y)) / 0xFF;
-				_string[0].ypos = ((VAR(VAR_V5_TALK_STRING_Y) - s) >> 1) + s - a->elevation + a->y;
+				_string[0].ypos = (int)(((VAR(VAR_V5_TALK_STRING_Y) - s) >> 1) + s - a->elevation + a->y);
 			} else {
 				_string[0].ypos = (int)VAR(VAR_V5_TALK_STRING_Y);
 			}
diff --git a/scummvm.vcproj b/scummvm.vcproj
new file mode 100644
index 0000000000..05554f65a1
--- /dev/null
+++ b/scummvm.vcproj
@@ -0,0 +1,494 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="scummvm"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\scummvm___Debug"
+			IntermediateDirectory=".\scummvm___Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,sound,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ALLOW_GDI,BYPASS_COPY_PROT"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\scummvm___Debug/scummvm.pch"
+				AssemblerListingLocation=".\scummvm___Debug/"
+				ObjectFile=".\scummvm___Debug/"
+				ProgramDataBaseFileName=".\scummvm___Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386 /FIXED:NO"
+				AdditionalDependencies="sdl.lib winmm.lib wsock32.lib simon___Debug\simon.lib scumm___Debug\scumm.lib sky___Debug\sky.lib"
+				OutputFile=".\scummvm___Debug/scummvm.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libc"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\scummvm___Debug/scummvm.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\scummvm___Debug/scummvm.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1053"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\scummvm___Release"
+			IntermediateDirectory=".\scummvm___Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,sound,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,USE_ADLIB,BYPASS_COPY_PROT"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=".\scummvm___Release/scummvm.pch"
+				AssemblerListingLocation=".\scummvm___Release/"
+				ObjectFile=".\scummvm___Release/"
+				ProgramDataBaseFileName=".\scummvm___Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="sdl.lib winmm.lib wsock32.lib simon___Release\simon.lib scumm___Release\scumm.lib sky___Release\sky.lib"
+				OutputFile=".\scummvm___Release/scummvm.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libc"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\scummvm___Release/scummvm.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\scummvm___Release/scummvm.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1053"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="mad mp3 Release|Win32"
+			OutputDirectory=".\scummvm___mad_mp3_Release"
+			IntermediateDirectory=".\scummvm___mad_mp3_Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="2"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,sound,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=".\scummvm___mad_mp3_Release/scummvm.pch"
+				AssemblerListingLocation=".\scummvm___mad_mp3_Release/"
+				ObjectFile=".\scummvm___mad_mp3_Release/"
+				ProgramDataBaseFileName=".\scummvm___mad_mp3_Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="sdl.lib winmm.lib wsock32.lib libmad.lib scumm___mad_mp3_Release\scumm.lib simon___mad_mp3_Release\simon.lib sky___mad_mp3_Release\sky.lib"
+				OutputFile=".\scummvm___mad_mp3_Release/scummvm.exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libc,libcd"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\scummvm___mad_mp3_Release/scummvm.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\scummvm___mad_mp3_Release/scummvm.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1053"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+		<Configuration
+			Name="mad mp3 Debug|Win32"
+			OutputDirectory=".\scummvm___mad_mp3_Debug"
+			IntermediateDirectory=".\scummvm___mad_mp3_Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,sound,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,ALLOW_GDI,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\scummvm___mad_mp3_Debug/scummvm.pch"
+				AssemblerListingLocation=".\scummvm___mad_mp3_Debug/"
+				ObjectFile=".\scummvm___mad_mp3_Debug/"
+				ProgramDataBaseFileName=".\scummvm___mad_mp3_Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386 /FIXED:NO"
+				AdditionalDependencies="sdl.lib winmm.lib libmad.lib wsock32.lib scumm___mad_mp3_Debug\scumm.lib simon___mad_mp3_Debug\simon.lib sky___mad_mp3_Debug\sky.lib"
+				OutputFile=".\scummvm___mad_mp3_Debug/scummvm.exe"
+				LinkIncremental="2"
+				SuppressStartupBanner="TRUE"
+				IgnoreDefaultLibraryNames="libc,libcd"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\scummvm___mad_mp3_Debug/scummvm.pdb"
+				SubSystem="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\scummvm___mad_mp3_Debug/scummvm.tlb"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1053"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<Filter
+				Name="common"
+				Filter="">
+				<File
+					RelativePath=".\common\config-file.cpp">
+				</File>
+				<File
+					RelativePath=".\common\config-file.h">
+				</File>
+				<File
+					RelativePath=".\common\engine.cpp">
+				</File>
+				<File
+					RelativePath=".\common\engine.h">
+				</File>
+				<File
+					RelativePath=".\common\file.cpp">
+				</File>
+				<File
+					RelativePath=".\common\file.h">
+				</File>
+				<File
+					RelativePath=".\common\gameDetector.cpp">
+				</File>
+				<File
+					RelativePath=".\common\gameDetector.h">
+				</File>
+				<File
+					RelativePath=".\common\list.h">
+				</File>
+				<File
+					RelativePath=".\common\main.cpp">
+				</File>
+				<File
+					RelativePath=".\common\map.h">
+				</File>
+				<File
+					RelativePath=".\common\rect.h">
+				</File>
+				<File
+					RelativePath=".\common\scaler.cpp">
+				</File>
+				<File
+					RelativePath=".\common\scaler.h">
+				</File>
+				<File
+					RelativePath=".\common\scummsys.h">
+				</File>
+				<File
+					RelativePath=".\common\stdafx.h">
+				</File>
+				<File
+					RelativePath=".\common\str.cpp">
+				</File>
+				<File
+					RelativePath=".\common\str.h">
+				</File>
+				<File
+					RelativePath=".\common\system.h">
+				</File>
+				<File
+					RelativePath=".\common\timer.cpp">
+				</File>
+				<File
+					RelativePath=".\common\timer.h">
+				</File>
+				<File
+					RelativePath=".\common\util.cpp">
+				</File>
+				<File
+					RelativePath=".\common\util.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="sound"
+				Filter="">
+				<File
+					RelativePath=".\sound\fmopl.cpp">
+				</File>
+				<File
+					RelativePath=".\sound\fmopl.h">
+				</File>
+				<File
+					RelativePath=".\sound\mididrv.h">
+				</File>
+				<File
+					RelativePath=".\sound\midiparser.cpp">
+				</File>
+				<File
+					RelativePath=".\sound\midiparser.h">
+				</File>
+				<File
+					RelativePath=".\sound\midiparser_smf.cpp">
+				</File>
+				<File
+					RelativePath=".\sound\midiparser_xmidi.cpp">
+				</File>
+				<File
+					RelativePath=".\sound\mixer.cpp">
+				</File>
+				<File
+					RelativePath=".\sound\mixer.h">
+				</File>
+				<File
+					RelativePath=".\sound\mpu401.cpp">
+				</File>
+				<File
+					RelativePath=".\sound\mpu401.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="gui"
+				Filter="">
+				<File
+					RelativePath=".\gui\EditTextWidget.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\EditTextWidget.h">
+				</File>
+				<File
+					RelativePath=".\gui\ListWidget.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\ListWidget.h">
+				</File>
+				<File
+					RelativePath=".\gui\PopUpWidget.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\PopUpWidget.h">
+				</File>
+				<File
+					RelativePath=".\gui\ScrollBarWidget.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\ScrollBarWidget.h">
+				</File>
+				<File
+					RelativePath=".\gui\browser.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\browser.h">
+				</File>
+				<File
+					RelativePath=".\gui\chooser.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\chooser.h">
+				</File>
+				<File
+					RelativePath=".\gui\console.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\console.h">
+				</File>
+				<File
+					RelativePath=".\gui\dialog.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\dialog.h">
+				</File>
+				<File
+					RelativePath=".\gui\launcher.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\launcher.h">
+				</File>
+				<File
+					RelativePath=".\gui\message.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\message.h">
+				</File>
+				<File
+					RelativePath=".\gui\newgui.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\newgui.h">
+				</File>
+				<File
+					RelativePath=".\gui\options.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\options.h">
+				</File>
+				<File
+					RelativePath=".\gui\widget.cpp">
+				</File>
+				<File
+					RelativePath=".\gui\widget.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="backends"
+				Filter="">
+				<Filter
+					Name="sdl"
+					Filter="">
+					<File
+						RelativePath=".\backends\sdl\sdl-common.cpp">
+					</File>
+					<File
+						RelativePath=".\backends\sdl\sdl-common.h">
+					</File>
+					<File
+						RelativePath=".\backends\sdl\sdl.cpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="fs"
+					Filter="">
+					<File
+						RelativePath=".\backends\fs\fs.h">
+					</File>
+					<File
+						RelativePath=".\backends\fs\windows\windows-fs.cpp">
+					</File>
+				</Filter>
+				<Filter
+					Name="midi"
+					Filter="">
+					<File
+						RelativePath=".\backends\midi\adlib.cpp">
+					</File>
+					<File
+						RelativePath=".\backends\midi\null.cpp">
+					</File>
+					<File
+						RelativePath=".\backends\midi\windows.cpp">
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
+		<File
+			RelativePath=".\NEWS">
+		</File>
+		<File
+			RelativePath=".\README">
+		</File>
+		<File
+			RelativePath=".\scummvm.ico">
+		</File>
+		<File
+			RelativePath=".\scummvm.rc">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/simon.vcproj b/simon.vcproj
new file mode 100644
index 0000000000..3fba5779d9
--- /dev/null
+++ b/simon.vcproj
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="simon"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\simon___Release"
+			IntermediateDirectory=".\simon___Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\simon___Release/simon.pch"
+				AssemblerListingLocation=".\simon___Release/"
+				ObjectFile=".\simon___Release/"
+				ProgramDataBaseFileName=".\simon___Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\simon___Release\simon.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="mad mp3 Debug|Win32"
+			OutputDirectory=".\simon___mad_mp3_Debug"
+			IntermediateDirectory=".\simon___mad_mp3_Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				PrecompiledHeaderFile=".\simon___mad_mp3_Debug/simon.pch"
+				AssemblerListingLocation=".\simon___mad_mp3_Debug/"
+				ObjectFile=".\simon___mad_mp3_Debug/"
+				ProgramDataBaseFileName=".\simon___mad_mp3_Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\simon___mad_mp3_Debug\simon.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\simon___Debug"
+			IntermediateDirectory=".\simon___Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB,BYPASS_COPY_PROT,USE_ADLIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\simon___Debug/simon.pch"
+				AssemblerListingLocation=".\simon___Debug/"
+				ObjectFile=".\simon___Debug/"
+				ProgramDataBaseFileName=".\simon___Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\simon___Debug\simon.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="mad mp3 Release|Win32"
+			OutputDirectory=".\simon___mad_mp3_Release"
+			IntermediateDirectory=".\simon___mad_mp3_Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB,USE_ADLIB,BYPASS_COPY_PROT,USE_MAD"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\simon___mad_mp3_Release/simon.pch"
+				AssemblerListingLocation=".\simon___mad_mp3_Release/"
+				ObjectFile=".\simon___mad_mp3_Release/"
+				ProgramDataBaseFileName=".\simon___mad_mp3_Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\simon___mad_mp3_Release\simon.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath=".\simon\charset.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\debug.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\debug.h">
+			</File>
+			<File
+				RelativePath=".\simon\intern.h">
+			</File>
+			<File
+				RelativePath=".\simon\items.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\midi.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\midi.h">
+			</File>
+			<File
+				RelativePath=".\simon\midiparser_s1d.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\res.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\simon.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\simon.h">
+			</File>
+			<File
+				RelativePath=".\simon\sound.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\sound.h">
+			</File>
+			<File
+				RelativePath=".\simon\verb.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\vga.cpp">
+			</File>
+			<File
+				RelativePath=".\simon\vga.h">
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/sky.vcproj b/sky.vcproj
new file mode 100644
index 0000000000..930ec9c22c
--- /dev/null
+++ b/sky.vcproj
@@ -0,0 +1,586 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="sky"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="mad mp3 Release|Win32"
+			OutputDirectory=".\sky___mad_mp3_Release"
+			IntermediateDirectory=".\sky___mad_mp3_Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\sky___mad_mp3_Release/sky.pch"
+				AssemblerListingLocation=".\sky___mad_mp3_Release/"
+				ObjectFile=".\sky___mad_mp3_Release/"
+				ProgramDataBaseFileName=".\sky___mad_mp3_Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\sky___mad_mp3_Release\sky.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\sky___Debug"
+			IntermediateDirectory=".\sky___Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\sky___Debug/sky.pch"
+				AssemblerListingLocation=".\sky___Debug/"
+				ObjectFile=".\sky___Debug/"
+				ProgramDataBaseFileName=".\sky___Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\sky___Debug\sky.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="mad mp3 Debug|Win32"
+			OutputDirectory=".\sky___mad_mp3_Debug"
+			IntermediateDirectory=".\sky___mad_mp3_Debug"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,_DEBUG,_LIB"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\sky___mad_mp3_Debug/sky.pch"
+				AssemblerListingLocation=".\sky___mad_mp3_Debug/"
+				ObjectFile=".\sky___mad_mp3_Debug/"
+				ProgramDataBaseFileName=".\sky___mad_mp3_Debug/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\sky___mad_mp3_Debug\sky.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\sky___Release"
+			IntermediateDirectory=".\sky___Release"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				InlineFunctionExpansion="1"
+				OptimizeForProcessor="2"
+				AdditionalIncludeDirectories=".,common"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				RuntimeTypeInfo="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile=".\sky___Release/sky.pch"
+				AssemblerListingLocation=".\sky___Release/"
+				ObjectFile=".\sky___Release/"
+				ProgramDataBaseFileName=".\sky___Release/"
+				WarningLevel="3"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile=".\sky___Release\sky.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1045"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath=".\sky\autoroute.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\autoroute.h">
+			</File>
+			<File
+				RelativePath=".\sky\compact.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\compact.h">
+			</File>
+			<File
+				RelativePath=".\sky\control.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\control.h">
+			</File>
+			<File
+				RelativePath=".\sky\debug.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\debug.h">
+			</File>
+			<File
+				RelativePath=".\sky\disk.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\disk.h">
+			</File>
+			<File
+				RelativePath=".\sky\grid.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\grid.h">
+			</File>
+			<File
+				RelativePath=".\sky\hufftext.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\intro.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\intro.h">
+			</File>
+			<File
+				RelativePath=".\sky\introimg.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\logic.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\logic.h">
+			</File>
+			<File
+				RelativePath=".\sky\mouse.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\mouse.h">
+			</File>
+			<File
+				RelativePath=".\sky\rnc_deco.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\rnc_deco.h">
+			</File>
+			<File
+				RelativePath=".\sky\screen.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\screen.h">
+			</File>
+			<File
+				RelativePath=".\sky\sky.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\sky.h">
+			</File>
+			<File
+				RelativePath=".\sky\skydefs.h">
+			</File>
+			<File
+				RelativePath=".\sky\sound.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\sound.h">
+			</File>
+			<File
+				RelativePath=".\sky\struc.h">
+			</File>
+			<File
+				RelativePath=".\sky\talks.h">
+			</File>
+			<File
+				RelativePath=".\sky\text.cpp">
+			</File>
+			<File
+				RelativePath=".\sky\text.h">
+			</File>
+			<Filter
+				Name="compacts"
+				Filter="">
+				<File
+					RelativePath=".\sky\compacts\0compact.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\101comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\102comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\10comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\11comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\12comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\13comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\14comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\15comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\16comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\17comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\18comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\19comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\1compact.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\20comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\21comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\22comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\23comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\24comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\25comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\26comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\27comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\28comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\29comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\2compact.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\30comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\31comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\32comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\33comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\34comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\36comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\37comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\38comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\39comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\3compact.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\40comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\41comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\42comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\44comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\45comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\46comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\47comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\48comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\4compact.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\5compact.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\65comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\66comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\67comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\68comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\69comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\70comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\71comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\72comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\73comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\74comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\75comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\76comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\77comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\78comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\79comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\80comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\81comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\82comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\85comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\90comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\91comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\92comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\93comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\94comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\95comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\96comp.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\9compact.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\linc_gen.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\lincmenu.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\objects.h">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\savedata.cpp">
+				</File>
+				<File
+					RelativePath=".\sky\compacts\z_compac.h">
+				</File>
+			</Filter>
+			<Filter
+				Name="music"
+				Filter="">
+				<File
+					RelativePath=".\sky\music\adlibchannel.cpp">
+				</File>
+				<File
+					RelativePath=".\sky\music\adlibchannel.h">
+				</File>
+				<File
+					RelativePath=".\sky\music\adlibmusic.cpp">
+				</File>
+				<File
+					RelativePath=".\sky\music\adlibmusic.h">
+				</File>
+				<File
+					RelativePath=".\sky\music\gmchannel.cpp">
+				</File>
+				<File
+					RelativePath=".\sky\music\gmchannel.h">
+				</File>
+				<File
+					RelativePath=".\sky\music\gmmusic.cpp">
+				</File>
+				<File
+					RelativePath=".\sky\music\gmmusic.h">
+				</File>
+				<File
+					RelativePath=".\sky\music\mt32music.cpp">
+				</File>
+				<File
+					RelativePath=".\sky\music\mt32music.h">
+				</File>
+				<File
+					RelativePath=".\sky\music\musicbase.cpp">
+				</File>
+				<File
+					RelativePath=".\sky\music\musicbase.h">
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>