Merged fsnode with trunk: r27971:28460

svn-id: r28462

6 files changed, 309 insertions, 36 deletions

diff --git a/dists/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj
new file mode 100644
index 0000000000..bc4a835037
--- /dev/null
+++ b/dists/msvc8/drascula.vcproj
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="windows-1250"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="drascula"
+	ProjectGUID="{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
+	RootNamespace="drascula"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="drascula_Debug"
+			IntermediateDirectory="drascula_Debug"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
+				Optimization="0"
+				AdditionalIncludeDirectories="../..;../../engines"
+				PreprocessorDefinitions="WIN32;_DEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				MinimalRebuild="true"
+				ExceptionHandling="1"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="false"
+				SuppressStartupBanner="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/drascula.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="drascula_Release"
+			IntermediateDirectory="drascula_Release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="../../;../../engines"
+				PreprocessorDefinitions="WIN32;NDEBUG;USE_ZLIB;USE_MAD;USE_VORBIS"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="false"
+				ForceConformanceInForLoopScope="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				WarnAsError="true"
+				DebugInformationFormat="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/drascula.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\engines\drascula\detection.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\drascula.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\drascula.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\texts.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 5def46a7e2..54b193f557 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -169,6 +169,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\coktelvideo.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\coktelvideo.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\dataio.cpp"
 			>
 		</File>
@@ -261,14 +269,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\imd.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\imd.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\init.cpp"
 			>
 		</File>
@@ -313,6 +313,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\inter_v4.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\map.cpp"
 			>
 		</File>
@@ -440,6 +444,14 @@
 			RelativePath="..\..\engines\gob\video_v2.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\..\engines\gob\videoplayer.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\videoplayer.h"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index 0c32b1ee8a..3391e13620 100644
--- a/dists/msvc8/kyra.vcproj
+++ b/dists/msvc8/kyra.vcproj
@@ -161,11 +161,15 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\kyra\animator.cpp"
+			RelativePath="..\..\engines\kyra\animator_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator.h"
+			RelativePath="..\..\engines\kyra\animator_v1.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\animator_v2.cpp"
 			>
 		</File>
 		<File
@@ -181,11 +185,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui.cpp"
+			RelativePath="..\..\engines\kyra\gui_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\gui_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items.cpp"
+			RelativePath="..\..\engines\kyra\items_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\items_v2.cpp"
 			>
 		</File>
 		<File
@@ -229,7 +241,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp"
+			RelativePath="..\..\engines\kyra\saveload_v1.cpp"
 			>
 		</File>
 		<File
@@ -237,6 +249,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\scene_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\scene_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\screen.cpp"
 			>
 		</File>
@@ -245,6 +265,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\screen_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\screen_v1.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\screen_v2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\screen_v2.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\script.cpp"
 			>
 		</File>
@@ -257,6 +293,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\script_v2.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\seqplayer.cpp"
 			>
 		</File>
@@ -293,6 +333,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\sound_v1.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\sprites.cpp"
 			>
 		</File>
@@ -313,10 +357,30 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\text_v1.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\timer.cpp"
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\timer.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\timer_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\timer_v2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\util.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\vqa.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/parallaction.vcproj b/dists/msvc8/parallaction.vcproj
index c3f04c0e58..ec6d2bbacc 100644
--- a/dists/msvc8/parallaction.vcproj
+++ b/dists/msvc8/parallaction.vcproj
@@ -165,11 +165,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\archive.cpp"
+			RelativePath="..\..\engines\parallaction\callables_br.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\callables.cpp"
+			RelativePath="..\..\engines\parallaction\callables_ns.cpp"
 			>
 		</File>
 		<File
@@ -201,27 +201,27 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\disk.cpp"
+			RelativePath="..\..\engines\parallaction\disk.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\disk.h"
+			RelativePath="..\..\engines\parallaction\disk_br.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\font.cpp"
+			RelativePath="..\..\engines\parallaction\disk_ns.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\graphics.cpp"
+			RelativePath="..\..\engines\parallaction\font.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\graphics.h"
+			RelativePath="..\..\engines\parallaction\graphics.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\parallaction\intro.cpp"
+			RelativePath="..\..\engines\parallaction\graphics.h"
 			>
 		</File>
 		<File
@@ -253,6 +253,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\parallaction_br.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\parallaction_ns.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\parser.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln
index 3f36ba78e9..179e106a4e 100644
--- a/dists/msvc8/scummvm.sln
+++ b/dists/msvc8/scummvm.sln
@@ -3,20 +3,21 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scummvm", "scummvm.vcproj", "{8434CB15-D08F-427D-9E6D-581AE5B28440}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6CC3E421-779D-4E80-8100-520886A0F9FF} = {6CC3E421-779D-4E80-8100-520886A0F9FF}
-		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
-		{0068957B-E2E1-4988-8C87-D541D84DAF20} = {0068957B-E2E1-4988-8C87-D541D84DAF20}
-		{8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
-		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
-		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
-		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
-		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
-		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
-		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
-		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
-		{D4986356-D0BB-4981-924A-854157BDF11F} = {D4986356-D0BB-4981-924A-854157BDF11F}
-		{1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
-		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3} = {CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}
 		{C8AAE83E-198B-4ECA-A877-166827953979} = {C8AAE83E-198B-4ECA-A877-166827953979}
+		{B6AFD548-63D2-40CD-A652-E87095AFCBAF} = {B6AFD548-63D2-40CD-A652-E87095AFCBAF}
+		{1CA4AC50-5426-433A-8B5E-FFE39568098E} = {1CA4AC50-5426-433A-8B5E-FFE39568098E}
+		{D4986356-D0BB-4981-924A-854157BDF11F} = {D4986356-D0BB-4981-924A-854157BDF11F}
+		{B5527758-2F51-4CCD-AAE1-B0E28654BD6A} = {B5527758-2F51-4CCD-AAE1-B0E28654BD6A}
+		{6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7} = {6A55AF61-7CA1-49E0-9385-59C1FE9D4DB7}
+		{F5F57066-CDF4-4F80-B9E7-7F4D21850D6E} = {F5F57066-CDF4-4F80-B9E7-7F4D21850D6E}
+		{E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA} = {E0EC9C72-A33E-49DA-B1DC-BB44B9799BFA}
+		{976D947A-A45F-4437-991E-412F695C64C7} = {976D947A-A45F-4437-991E-412F695C64C7}
+		{9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC} = {9D9A98A0-F88F-4CA2-B8FF-462470EBE3EC}
+		{676DB4C5-9A3E-4EE1-8483-EBB79DC0700E} = {676DB4C5-9A3E-4EE1-8483-EBB79DC0700E}
+		{8863B00B-059A-471E-876D-A955ECEFD0D2} = {8863B00B-059A-471E-876D-A955ECEFD0D2}
+		{0068957B-E2E1-4988-8C87-D541D84DAF20} = {0068957B-E2E1-4988-8C87-D541D84DAF20}
+		{1A1CA028-61B5-4A6C-A918-F5D8721AB1AC} = {1A1CA028-61B5-4A6C-A918-F5D8721AB1AC}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sword2", "sword2.vcproj", "{6CC3E421-779D-4E80-8100-520886A0F9FF}"
@@ -49,6 +50,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "parallaction", "parallactio
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cruise", "cruise.vcproj", "{8863B00B-059A-471E-876D-A955ECEFD0D2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "drascula", "drascula.vcproj", "{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -119,6 +122,10 @@ Global
 		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Debug|Win32.Build.0 = Debug|Win32
 		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.ActiveCfg = Release|Win32
 		{8863B00B-059A-471E-876D-A955ECEFD0D2}.Release|Win32.Build.0 = Release|Win32
+		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Debug|Win32.Build.0 = Debug|Win32
+		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.ActiveCfg = Release|Win32
+		{CF888EE2-239C-40D7-83F1-1CDD4F7D56E3}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 9c41118229..978e6ddc3f 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -68,7 +68,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.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 cruise_debug/cruise.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib sky_debug/sky.lib parallaction_debug/parallaction.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.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 cruise_debug/cruise.lib kyra_debug/kyra.lib gob_debug/gob.lib queen_debug/queen.lib saga_debug/saga.lib agi_debug/agi.lib scumm_debug/scumm.lib agos_debug/agos.lib drascula_debug/drascula.lib sky_debug/sky.lib parallaction_debug/parallaction.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -158,7 +158,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib parallaction_release/parallaction.lib"
+				AdditionalDependencies="winmm.lib sdl.lib zlib.lib libmad.lib vorbisfile_static.lib vorbis_static.lib ogg_static.lib libmpeg2.lib saga_release/saga.lib agi_release/agi.lib sword1_release/sword1.lib sword2_release/sword2.lib lure_release/lure.lib cine_release/cine.lib cruise_release/cruise.lib kyra_release/kyra.lib gob_release/gob.lib queen_release/queen.lib scumm_release/scumm.lib agos_release/agos.lib sky_release/sky.lib drascula_release/drascula.lib parallaction_release/parallaction.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"