Merged revisions 32124,32126-32128,32131,32133,32135-32144,32146-32153,32155-32163,32165-32168,32170-32173,32175-32179,32181-32191,32193-32202,32204-32205,32209-32214,32216,32218,32220-32235,32237-32266,32269-32271,32273-32290,32292-32295,32297-32317,32319-32323,32325-32328,32330-32331,32334-32338,32343-32347 via svnmerge from

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

svn-id: r32350

9 files changed, 38 insertions, 52 deletions

diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index c1504ebba8..7171707e8b 100644
--- a/dists/engine-data/kyra.dat
+++ b/dists/engine-data/kyra.dat
diff --git a/dists/msvc7/saga.vcproj b/dists/msvc7/saga.vcproj
index ecbdec967b..1a1cb29555 100644
--- a/dists/msvc7/saga.vcproj
+++ b/dists/msvc7/saga.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.00"
@@ -151,9 +151,6 @@
 			RelativePath="..\..\engines\saga\gfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ihnm_introproc.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\image.cpp">
 		</File>
 		<File
@@ -166,13 +163,16 @@
 			RelativePath="..\..\engines\saga\interface.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.cpp">
+			RelativePath="..\..\engines\saga\introproc_ihnm.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.h">
+			RelativePath="..\..\engines\saga\introproc_ite.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\saga\isomap.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ite_introproc.cpp">
+			RelativePath="..\..\engines\saga\isomap.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\saga\itedata.cpp">
@@ -226,9 +226,6 @@
 			RelativePath="..\..\engines\saga\saga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sagaresnames.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\saveload.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index 55358a2cc6..aedfbe80f4 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -21,7 +21,7 @@
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU"
+				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"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -74,7 +74,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU"
+				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"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
 				ExceptionHandling="TRUE"
diff --git a/dists/msvc71/saga.vcproj b/dists/msvc71/saga.vcproj
index 1e1333a9c7..388dd64ff2 100644
--- a/dists/msvc71/saga.vcproj
+++ b/dists/msvc71/saga.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
@@ -165,9 +165,6 @@
 			RelativePath="..\..\engines\saga\gfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ihnm_introproc.cpp">
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\image.cpp">
 		</File>
 		<File
@@ -180,13 +177,16 @@
 			RelativePath="..\..\engines\saga\interface.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.cpp">
+			RelativePath="..\..\engines\saga\introproc_ihnm.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.h">
+			RelativePath="..\..\engines\saga\introproc_ite.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\saga\isomap.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ite_introproc.cpp">
+			RelativePath="..\..\engines\saga\isomap.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\saga\itedata.cpp">
@@ -240,9 +240,6 @@
 			RelativePath="..\..\engines\saga\saga.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sagaresnames.h">
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\saveload.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 5e1100b788..7b7b5b72c8 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -21,7 +21,7 @@
 				AdditionalOptions="/wd4201 /wd4512 /wd4511 /wd4100 /wd4121 /wd4310 /wd4706 /wd4127 /wd4189 /wd4702"
 				Optimization="0"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_NASM;USE_MT32EMU"
+				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"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="TRUE"
 				BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU"
+				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"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
 				ExceptionHandling="TRUE"
diff --git a/dists/msvc8/saga.vcproj b/dists/msvc8/saga.vcproj
index d40332b470..79f7d35fb5 100644
--- a/dists/msvc8/saga.vcproj
+++ b/dists/msvc8/saga.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
@@ -233,10 +233,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ihnm_introproc.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\image.cpp"
 			>
 		</File>
@@ -253,15 +249,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.cpp"
+			RelativePath="..\..\engines\saga\introproc_ihnm.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.h"
+			RelativePath="..\..\engines\saga\introproc_ite.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ite_introproc.cpp"
+			RelativePath="..\..\engines\saga\isomap.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\saga\isomap.h"
 			>
 		</File>
 		<File
@@ -333,10 +333,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sagaresnames.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\saveload.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index db5c10efd3..a5cd6a9169 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"
+				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"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -130,7 +130,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU"
+				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"
 				StringPooling="true"
 				MinimalRebuild="false"
 				ExceptionHandling="1"
diff --git a/dists/msvc9/saga.vcproj b/dists/msvc9/saga.vcproj
index 8d70a3d411..9675dda2e9 100644
--- a/dists/msvc9/saga.vcproj
+++ b/dists/msvc9/saga.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="windows-1252"?>
+<?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -234,10 +234,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ihnm_introproc.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\image.cpp"
 			>
 		</File>
@@ -254,15 +250,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.cpp"
+			RelativePath="..\..\engines\saga\introproc_ihnm.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\isomap.h"
+			RelativePath="..\..\engines\saga\introproc_ite.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\ite_introproc.cpp"
+			RelativePath="..\..\engines\saga\isomap.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\saga\isomap.h"
 			>
 		</File>
 		<File
@@ -334,10 +334,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\saga\sagaresnames.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\saga\saveload.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index 0de6bdc616..d5904961a7 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -43,7 +43,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"
+				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"
 				MinimalRebuild="true"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="3"
@@ -133,7 +133,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../..;../../engines"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;USE_ZLIB;USE_MAD;USE_VORBIS;USE_MPEG2;USE_MT32EMU"
+				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"
 				StringPooling="true"
 				MinimalRebuild="false"
 				ExceptionHandling="1"