update

svn-id: r18014

9 files changed, 463 insertions, 400 deletions

diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
new file mode 100644
index 0000000000..c6b9d6b201
--- /dev/null
+++ b/dists/msvc7/gob.vcproj
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding = "windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.00"
+	Name="gob"
+	ProjectGUID="{AA83E230-EC4A-44DF-896C-4472F20CE168}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="gob_Debug"
+			IntermediateDirectory="gob_Debug"
+			ConfigurationType="4"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../;../../common"
+				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				MinimalRebuild="TRUE"
+				ExceptionHandling="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				SuppressStartupBanner="FALSE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/gob.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="gob_Release"
+			IntermediateDirectory="gob_Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="FALSE">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="TRUE"
+				AdditionalIncludeDirectories="../../;../../common"
+				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				StringPooling="TRUE"
+				ExceptionHandling="TRUE"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="FALSE"
+				EnableFunctionLevelLinking="FALSE"
+				ForceConformanceInForLoopScope="TRUE"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="TRUE"
+				DebugInformationFormat="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/gob.lib"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<Files>
+		<File
+			RelativePath="..\..\gob\anim.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\anim.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\cdrom.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\cdrom.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\dataio.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\dataio.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\draw.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\draw.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\driver_vga.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\driver_vga.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\game.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\game.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\global.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\global.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\gob.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\gob.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\goblin.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\goblin.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\init.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\init.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\inter.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\inter.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\map.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\map.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\mult.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\mult.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\pack.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\pack.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\palanim.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\palanim.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\parse.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\parse.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\scenery.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\scenery.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\sound.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\sound.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\timer.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\timer.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\util.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\util.h">
+		</File>
+		<File
+			RelativePath="..\..\gob\video.cpp">
+		</File>
+		<File
+			RelativePath="..\..\gob\video.h">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dists/msvc7/saga.vcproj b/dists/msvc7/saga.vcproj
index 189909150c..9c953b7ba3 100644
--- a/dists/msvc7/saga.vcproj
+++ b/dists/msvc7/saga.vcproj
@@ -98,24 +98,12 @@
 	</Configurations>
 	<Files>
 		<File
-			RelativePath="..\..\saga\actionmap.cpp">
-		</File>
-		<File
-			RelativePath="..\..\saga\actionmap.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\actor.cpp">
 		</File>
 		<File
 			RelativePath="..\..\saga\actor.h">
 		</File>
 		<File
-			RelativePath="..\..\saga\actordata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\saga\actordata.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\animation.cpp">
 		</File>
 		<File
@@ -128,27 +116,12 @@
 			RelativePath="..\..\saga\console.h">
 		</File>
 		<File
-			RelativePath="..\..\saga\cvar.cpp">
-		</File>
-		<File
-			RelativePath="..\..\saga\cvar.h">
-		</File>
-		<File
-			RelativePath="..\..\saga\cvar_mod.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\events.cpp">
 		</File>
 		<File
 			RelativePath="..\..\saga\events.h">
 		</File>
 		<File
-			RelativePath="..\..\saga\expr.cpp">
-		</File>
-		<File
-			RelativePath="..\..\saga\expr.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\font.cpp">
 		</File>
 		<File
@@ -161,12 +134,6 @@
 			RelativePath="..\..\saga\game.cpp">
 		</File>
 		<File
-			RelativePath="..\..\saga\game.h">
-		</File>
-		<File
-			RelativePath="..\..\saga\game_mod.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\gfx.cpp">
 		</File>
 		<File
@@ -179,9 +146,6 @@
 			RelativePath="..\..\saga\image.cpp">
 		</File>
 		<File
-			RelativePath="..\..\saga\image.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\input.cpp">
 		</File>
 		<File
@@ -200,16 +164,19 @@
 			RelativePath="..\..\saga\ite_introproc.cpp">
 		</File>
 		<File
-			RelativePath="..\..\saga\music.cpp">
+			RelativePath="..\..\saga\itedata.cpp">
 		</File>
 		<File
-			RelativePath="..\..\saga\music.h">
+			RelativePath="..\..\saga\itedata.h">
 		</File>
 		<File
-			RelativePath="..\..\saga\objectdata.cpp">
+			RelativePath="..\..\saga\list.h">
 		</File>
 		<File
-			RelativePath="..\..\saga\objectdata.h">
+			RelativePath="..\..\saga\music.cpp">
+		</File>
+		<File
+			RelativePath="..\..\saga\music.h">
 		</File>
 		<File
 			RelativePath="..\..\saga\objectmap.cpp">
@@ -224,9 +191,6 @@
 			RelativePath="..\..\saga\palanim.h">
 		</File>
 		<File
-			RelativePath="..\..\saga\reinherit.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\render.cpp">
 		</File>
 		<File
@@ -251,6 +215,9 @@
 			RelativePath="..\..\saga\saga.h">
 		</File>
 		<File
+			RelativePath="..\..\saga\saveload.cpp">
+		</File>
+		<File
 			RelativePath="..\..\saga\scene.cpp">
 		</File>
 		<File
@@ -263,12 +230,6 @@
 			RelativePath="..\..\saga\script.h">
 		</File>
 		<File
-			RelativePath="..\..\saga\sdata.cpp">
-		</File>
-		<File
-			RelativePath="..\..\saga\sdata.h">
-		</File>
-		<File
 			RelativePath="..\..\saga\sdebug.cpp">
 		</File>
 		<File
@@ -296,6 +257,9 @@
 			RelativePath="..\..\saga\sthread.cpp">
 		</File>
 		<File
+			RelativePath="..\..\saga\stream.h">
+		</File>
+		<File
 			RelativePath="..\..\saga\text.cpp">
 		</File>
 		<File
@@ -304,12 +268,6 @@
 		<File
 			RelativePath="..\..\saga\transitions.cpp">
 		</File>
-		<File
-			RelativePath="..\..\saga\ys_dl_list.cpp">
-		</File>
-		<File
-			RelativePath="..\..\saga\yslib.h">
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc7/scumm.vcproj b/dists/msvc7/scumm.vcproj
index a94ff7a5f7..5e65aeaf9c 100644
--- a/dists/msvc7/scumm.vcproj
+++ b/dists/msvc7/scumm.vcproj
@@ -310,6 +310,12 @@
 			RelativePath="..\..\scumm\intern.h">
 		</File>
 		<File
+			RelativePath="..\..\scumm\logic_he.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\logic_he.h">
+		</File>
+		<File
 			RelativePath="..\..\scumm\midiparser_eup.cpp">
 		</File>
 		<File
@@ -334,12 +340,21 @@
 			RelativePath="..\..\scumm\palette.cpp">
 		</File>
 		<File
+			RelativePath="..\..\scumm\palette_he.cpp">
+		</File>
+		<File
 			RelativePath="..\..\scumm\player_mod.cpp">
 		</File>
 		<File
 			RelativePath="..\..\scumm\player_mod.h">
 		</File>
 		<File
+			RelativePath="..\..\scumm\player_nes.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\player_nes.h">
+		</File>
+		<File
 			RelativePath="..\..\scumm\player_v1.cpp">
 		</File>
 		<File
@@ -385,6 +400,9 @@
 			RelativePath="..\..\scumm\resource_v7he.h">
 		</File>
 		<File
+			RelativePath="..\..\scumm\room.cpp">
+		</File>
+		<File
 			RelativePath="..\..\scumm\saveload.cpp">
 		</File>
 		<File
@@ -397,6 +415,9 @@
 			RelativePath="..\..\scumm\script.h">
 		</File>
 		<File
+			RelativePath="..\..\scumm\script_v100he.cpp">
+		</File>
+		<File
 			RelativePath="..\..\scumm\script_v2.cpp">
 		</File>
 		<File
@@ -409,10 +430,10 @@
 			RelativePath="..\..\scumm\script_v6he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v7he.cpp">
+			RelativePath="..\..\scumm\script_v72he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v72he.cpp">
+			RelativePath="..\..\scumm\script_v7he.cpp">
 		</File>
 		<File
 			RelativePath="..\..\scumm\script_v8.cpp">
@@ -424,9 +445,6 @@
 			RelativePath="..\..\scumm\script_v90he.cpp">
 		</File>
 		<File
-			RelativePath="..\..\scumm\script_v100he.cpp">
-		</File>
-		<File
 			RelativePath="..\..\scumm\scumm-md5.h">
 		</File>
 		<File
@@ -442,15 +460,30 @@
 			RelativePath="..\..\scumm\sound.h">
 		</File>
 		<File
+			RelativePath="..\..\scumm\sprite_he.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\sprite_he.h">
+		</File>
+		<File
 			RelativePath="..\..\scumm\string.cpp">
 		</File>
 		<File
+			RelativePath="..\..\scumm\thumbnail.cpp">
+		</File>
+		<File
 			RelativePath="..\..\scumm\usage_bits.cpp">
 		</File>
 		<File
 			RelativePath="..\..\scumm\usage_bits.h">
 		</File>
 		<File
+			RelativePath="..\..\scumm\util.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\util.h">
+		</File>
+		<File
 			RelativePath="..\..\scumm\vars.cpp">
 		</File>
 		<File
@@ -459,6 +492,12 @@
 		<File
 			RelativePath="..\..\scumm\verbs.h">
 		</File>
+		<File
+			RelativePath="..\..\scumm\wiz_he.cpp">
+		</File>
+		<File
+			RelativePath="..\..\scumm\wiz_he.h">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc7/scummvm.sln b/dists/msvc7/scummvm.sln
index faa4c1c370..b225aa3909 100644
--- a/dists/msvc7/scummvm.sln
+++ b/dists/msvc7/scummvm.sln
@@ -17,20 +17,23 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kyra", "kyra.vcproj", "{9D9
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saga", "saga.vcproj", "{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gob", "gob.vcproj", "{AA83E230-EC4A-44DF-896C-4472F20CE168}"
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		ConfigName.0 = Debug
 		ConfigName.1 = Release
 	EndGlobalSection
 	GlobalSection(ProjectDependencies) = postSolution
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {C8AAE83E-198B-4ECA-A877-166827953979}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
-		{8434CB15-D08F-427D-9E6D-581AE5B28440}.7 = {6CC3E421-779D-4E80-8100-520886A0F9FF}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.0 = {6CC3E421-779D-4E80-8100-520886A0F9FF}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.1 = {AA83E230-EC4A-44DF-896C-4472F20CE168}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.2 = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.3 = {C8AAE83E-198B-4ECA-A877-166827953979}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.4 = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.5 = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.6 = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.7 = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+		{8434CB15-D08F-427D-9E6D-581AE5B28440}.8 = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{8434CB15-D08F-427D-9E6D-581AE5B28440}.Debug.ActiveCfg = Debug|Win32
@@ -69,6 +72,10 @@ Global
 		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Debug.Build.0 = Debug|Win32
 		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release.ActiveCfg = Release|Win32
 		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}.Release.Build.0 = Release|Win32
+		{AA83E230-EC4A-44DF-896C-4472F20CE168}.Debug.ActiveCfg = Debug|Win32
+		{AA83E230-EC4A-44DF-896C-4472F20CE168}.Debug.Build.0 = Debug|Win32
+		{AA83E230-EC4A-44DF-896C-4472F20CE168}.Release.ActiveCfg = Release|Win32
+		{AA83E230-EC4A-44DF-896C-4472F20CE168}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index b495bd1a32..218b39699b 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlibstat.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.lib kyra_debug/kyra.lib queen_debug/queen.lib saga_debug/saga.lib scumm_debug/scumm.lib simon_debug/simon.lib sky_debug/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zlibstat.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib sword1_debug/sword1.lib sword2_debug/sword2.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="libcmtd.lib"
@@ -93,7 +93,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlibstat.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zlibstat.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib sword1_release/sword1.lib sword2_release/sword2.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib simon_release/simon.lib sky_release/sky.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -144,6 +144,9 @@
 			<File
 				RelativePath="..\..\base\plugins.h">
 			</File>
+			<File
+				RelativePath="..\..\base\version.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="common"
@@ -152,6 +155,12 @@
 				RelativePath="..\..\common\array.h">
 			</File>
 			<File
+				RelativePath="..\..\common\config-file.cpp">
+			</File>
+			<File
+				RelativePath="..\..\common\config-file.h">
+			</File>
+			<File
 				RelativePath="..\..\common\config-manager.cpp">
 			</File>
 			<File
@@ -182,6 +191,12 @@
 				RelativePath="..\..\common\md5.h">
 			</File>
 			<File
+				RelativePath="..\..\common\mutex.cpp">
+			</File>
+			<File
+				RelativePath="..\..\common\mutex.h">
+			</File>
+			<File
 				RelativePath="..\..\common\rect.h">
 			</File>
 			<File
@@ -318,12 +333,21 @@
 				<File
 					RelativePath="..\..\common\scaler\scalebit.h">
 				</File>
+				<File
+					RelativePath="..\..\common\scaler\thumbnail.cpp">
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="sound"
 			Filter="">
 			<File
+				RelativePath="..\..\sound\adpcm.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sound\adpcm.h">
+			</File>
+			<File
 				RelativePath="..\..\sound\audiocd.cpp">
 			</File>
 			<File
@@ -336,6 +360,12 @@
 				RelativePath="..\..\sound\audiostream.h">
 			</File>
 			<File
+				RelativePath="..\..\sound\flac.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sound\flac.h">
+			</File>
+			<File
 				RelativePath="..\..\sound\fmopl.cpp">
 			</File>
 			<File
@@ -395,6 +425,89 @@
 			<File
 				RelativePath="..\..\sound\vorbis.h">
 			</File>
+			<File
+				RelativePath="..\..\sound\wave.cpp">
+			</File>
+			<File
+				RelativePath="..\..\sound\wave.h">
+			</File>
+			<Filter
+				Name="softsynth"
+				Filter="">
+				<File
+					RelativePath="..\..\sound\softsynth\adlib.cpp">
+				</File>
+				<File
+					RelativePath="..\..\sound\softsynth\emumidi.h">
+				</File>
+				<File
+					RelativePath="..\..\sound\softsynth\fluidsynth.cpp">
+				</File>
+				<File
+					RelativePath="..\..\sound\softsynth\mt32.cpp">
+				</File>
+				<File
+					RelativePath="..\..\sound\softsynth\ym2612.cpp">
+				</File>
+				<Filter
+					Name="mt32"
+					Filter="">
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\freeverb.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\freeverb.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\i386.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\i386.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\mt32_file.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\mt32_file.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\mt32emu.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\part.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\part.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partial.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partial.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partialManager.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\partialManager.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\structures.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\synth.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\synth.h">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\tables.cpp">
+					</File>
+					<File
+						RelativePath="..\..\sound\softsynth\mt32\tables.h">
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="txt"
@@ -461,77 +574,11 @@
 				Name="midi"
 				Filter="">
 				<File
-					RelativePath="..\..\backends\midi\adlib.cpp">
-				</File>
-				<File
-					RelativePath="..\..\backends\midi\mt32.cpp">
-				</File>
-				<File
 					RelativePath="..\..\backends\midi\null.cpp">
 				</File>
 				<File
 					RelativePath="..\..\backends\midi\windows.cpp">
 				</File>
-				<File
-					RelativePath="..\..\backends\midi\ym2612.cpp">
-				</File>
-				<Filter
-					Name="mt32">
-					<File
-						RelativePath="..\..\backends\midi\mt32\freeverb.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\freeverb.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\i386.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\i386.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\mt32_file.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\mt32_file.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\mt32emu.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\part.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\part.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partial.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partial.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partialManager.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\partialManager.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\structures.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\synth.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\synth.h">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\tables.cpp">
-					</File>
-					<File
-						RelativePath="..\..\backends\midi\mt32\tables.h">
-					</File>
-				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
@@ -589,10 +636,10 @@
 				RelativePath="..\..\gui\console.cpp">
 			</File>
 			<File
-				RelativePath="..\..\gui\consolefont.cpp">
+				RelativePath="..\..\gui\console.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\console.h">
+				RelativePath="..\..\gui\credits.h">
 			</File>
 			<File
 				RelativePath="..\..\gui\dialog.cpp">
@@ -601,6 +648,12 @@
 				RelativePath="..\..\gui\dialog.h">
 			</File>
 			<File
+				RelativePath="..\..\gui\editable.cpp">
+			</File>
+			<File
+				RelativePath="..\..\gui\editable.h">
+			</File>
+			<File
 				RelativePath="..\..\gui\launcher.cpp">
 			</File>
 			<File
@@ -628,9 +681,6 @@
 				RelativePath="..\..\gui\options.h">
 			</File>
 			<File
-				RelativePath="..\..\gui\walkthrough.h">
-			</File>
-			<File
 				RelativePath="..\..\gui\widget.cpp">
 			</File>
 			<File
@@ -647,18 +697,39 @@
 				RelativePath="..\..\graphics\animation.h">
 			</File>
 			<File
+				RelativePath="..\..\graphics\consolefont.cpp">
+			</File>
+			<File
 				RelativePath="..\..\graphics\font.cpp">
 			</File>
 			<File
 				RelativePath="..\..\graphics\font.h">
 			</File>
 			<File
+				RelativePath="..\..\graphics\fontman.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\fontman.h">
+			</File>
+			<File
 				RelativePath="..\..\graphics\newfont.cpp">
 			</File>
 			<File
+				RelativePath="..\..\graphics\newfont_big.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\primitives.cpp">
+			</File>
+			<File
+				RelativePath="..\..\graphics\primitives.h">
+			</File>
+			<File
 				RelativePath="..\..\graphics\scummfont.cpp">
 			</File>
 			<File
+				RelativePath="..\..\graphics\surface.cpp">
+			</File>
+			<File
 				RelativePath="..\..\graphics\surface.h">
 			</File>
 		</Filter>
diff --git a/dists/msvc7/simon.vcproj b/dists/msvc7/simon.vcproj
index 658cb8c53b..84e4416188 100644
--- a/dists/msvc7/simon.vcproj
+++ b/dists/msvc7/simon.vcproj
@@ -102,6 +102,9 @@
 			RelativePath="..\..\simon\charset.cpp">
 		</File>
 		<File
+			RelativePath="..\..\simon\cursor.cpp">
+		</File>
+		<File
 			RelativePath="..\..\simon\debug.cpp">
 		</File>
 		<File
@@ -114,6 +117,9 @@
 			RelativePath="..\..\simon\debugger.h">
 		</File>
 		<File
+			RelativePath="..\..\simon\icons.cpp">
+		</File>
+		<File
 			RelativePath="..\..\simon\intern.h">
 		</File>
 		<File
@@ -132,6 +138,12 @@
 			RelativePath="..\..\simon\res.cpp">
 		</File>
 		<File
+			RelativePath="..\..\simon\saveload.cpp">
+		</File>
+		<File
+			RelativePath="..\..\simon\simon-md5.h">
+		</File>
+		<File
 			RelativePath="..\..\simon\simon.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/sky.vcproj b/dists/msvc7/sky.vcproj
index c34c6222e9..86de575359 100644
--- a/dists/msvc7/sky.vcproj
+++ b/dists/msvc7/sky.vcproj
@@ -138,241 +138,6 @@
 				RelativePath="..\..\sky\music\musicbase.h">
 			</File>
 		</Filter>
-		<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>
 		<File
 			RelativePath="..\..\sky\autoroute.cpp">
 		</File>
@@ -461,9 +226,6 @@
 			RelativePath="..\..\sky\struc.h">
 		</File>
 		<File
-			RelativePath="..\..\sky\talks.h">
-		</File>
-		<File
 			RelativePath="..\..\sky\text.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/sword1.vcproj b/dists/msvc7/sword1.vcproj
index 0734f53c20..2d7c3be522 100644
--- a/dists/msvc7/sword1.vcproj
+++ b/dists/msvc7/sword1.vcproj
@@ -113,6 +113,12 @@
 			RelativePath="..\..\sword1\control.h">
 		</File>
 		<File
+			RelativePath="..\..\sword1\credits.cpp">
+		</File>
+		<File
+			RelativePath="..\..\sword1\credits.h">
+		</File>
+		<File
 			RelativePath="..\..\sword1\debug.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/sword2.vcproj b/dists/msvc7/sword2.vcproj
index 1a2ed02021..e25c0712f3 100644
--- a/dists/msvc7/sword2.vcproj
+++ b/dists/msvc7/sword2.vcproj
@@ -113,24 +113,12 @@
 				RelativePath="..\..\sword2\driver\d_draw.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sword2\driver\d_draw.h">
-			</File>
-			<File
 				RelativePath="..\..\sword2\driver\d_sound.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sword2\driver\d_sound.h">
-			</File>
-			<File
-				RelativePath="..\..\sword2\driver\driver96.h">
-			</File>
-			<File
 				RelativePath="..\..\sword2\driver\menu.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sword2\driver\menu.h">
-			</File>
-			<File
 				RelativePath="..\..\sword2\driver\palette.cpp">
 			</File>
 			<File
@@ -140,9 +128,6 @@
 				RelativePath="..\..\sword2\driver\render.cpp">
 			</File>
 			<File
-				RelativePath="..\..\sword2\driver\render.h">
-			</File>
-			<File
 				RelativePath="..\..\sword2\driver\sprite.cpp">
 			</File>
 		</Filter>
@@ -264,15 +249,9 @@
 			RelativePath="..\..\sword2\speech.cpp">
 		</File>
 		<File
-			RelativePath="..\..\sword2\speech.h">
-		</File>
-		<File
 			RelativePath="..\..\sword2\startup.cpp">
 		</File>
 		<File
-			RelativePath="..\..\sword2\startup.h">
-		</File>
-		<File
 			RelativePath="..\..\sword2\sword2.cpp">
 		</File>
 		<File