Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r33450

4 files changed, 503 insertions, 3 deletions

diff --git a/dists/msvc8/parallaction.vcproj b/dists/msvc8/parallaction.vcproj
index c5721bd30f..e268fe1e6b 100644
--- a/dists/msvc8/parallaction.vcproj
+++ b/dists/msvc8/parallaction.vcproj
@@ -229,6 +229,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\gui.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\gui.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\gui_br.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scummvm.sln b/dists/msvc8/scummvm.sln
index d3621cbe45..8138c77a2b 100644
--- a/dists/msvc8/scummvm.sln
+++ b/dists/msvc8/scummvm.sln
@@ -61,6 +61,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m4", "m4.vcproj", "{6D576A2
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "made", "made.vcproj", "{E29B5D40-08F7-11DD-BD0B-0800200C9A66}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinsel", "tinsel.vcproj", "{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -147,6 +149,10 @@ Global
 		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
 		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
 		{E29B5D40-08F7-11DD-BD0B-0800200C9A66}.Release|Win32.Build.0 = Release|Win32
+		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.ActiveCfg = Debug|Win32
+		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Debug|Win32.Build.0 = Debug|Win32
+		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.Release|Win32.ActiveCfg = Release|Win32
+		{22AA7760-2C91-11DD-BD0B-0800200C9A66}.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 39056f231c..736873fb47 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -42,7 +42,7 @@
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702 /wd4996"
 				Optimization="0"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -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 igor_debug/igor.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 m4_debug/m4.lib made_debug/made.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 igor_debug/igor.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 m4_debug/m4.lib made_debug/made.lib tinsel_Debug/tinsel.lib"
 				OutputFile="$(OutDir)/scummvm.exe"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
@@ -133,7 +133,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU;ENABLE_AGI;ENABLE_AGOS;ENABLE_CINE;ENABLE_CRUISE;ENABLE_DRASCULA;ENABLE_GOB;ENABLE_IGOR;ENABLE_KYRA;ENABLE_LURE;ENABLE_M4;ENABLE_MADE;ENABLE_PARALLACTION;ENABLE_QUEEN;ENABLE_SAGA;ENABLE_SCUMM;ENABLE_SKY;ENABLE_SWORD1;ENABLE_SWORD2;ENABLE_TOUCHE;ENABLE_SCUMM_7_8;ENABLE_HE;ENABLE_TINSEL"
 				StringPooling="true"
 				MinimalRebuild="false"
 				ExceptionHandling="1"
diff --git a/dists/msvc8/tinsel.vcproj b/dists/msvc8/tinsel.vcproj
new file mode 100644
index 0000000000..cb6ba0c2e8
--- /dev/null
+++ b/dists/msvc8/tinsel.vcproj
@@ -0,0 +1,486 @@
+<?xml version="1.0" encoding="windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="tinsel"
+	ProjectGUID="{22AA7760-2C91-11DD-BD0B-0800200C9A66}"
+	RootNamespace="tinsel"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="tinsel_Debug"
+			IntermediateDirectory="tinsel_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="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/tinsel.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="tinsel_Release"
+			IntermediateDirectory="tinsel_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)/tinsel.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\engines\tinsel\actors.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\actors.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\anim.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\anim.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\background.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\background.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\bg.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\cliprect.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\cliprect.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\config.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\config.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\coroutine.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\cursor.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\cursor.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\debugger.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\debugger.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\detection.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\dw.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\effect.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\events.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\events.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\faders.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\faders.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\film.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\font.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\font.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\graphics.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\graphics.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\handle.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\handle.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\heapmem.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\heapmem.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\inventory.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\inventory.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\mareels.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\move.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\move.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\multiobj.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\multiobj.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\music.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\music.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\object.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\object.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\palette.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\palette.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\pcode.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\pcode.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\pdisplay.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\pid.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\play.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\polygons.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\polygons.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\rince.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\rince.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\saveload.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\savescn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\savescn.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\scene.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\scene.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\sched.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\sched.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\scn.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\scn.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\scroll.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\scroll.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\serializer.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\sound.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\sound.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\strres.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\strres.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\text.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\text.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\timers.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\timers.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\tinlib.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\tinlib.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\tinsel.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\tinsel.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\token.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\tinsel\token.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>