Merged revisions 32348-32349,32351-32356,32358-32411,32413-32441,32443-32445,32449,32453-32454,32456-32457,32459-32462,32464-32465,32467-32492,32494-32503 via svnmerge from

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

svn-id: r32505

12 files changed, 84 insertions, 8 deletions

diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj
index 8a55a1856b..3bf3cf94ea 100644
--- a/dists/msvc7/drascula.vcproj
+++ b/dists/msvc7/drascula.vcproj
@@ -112,10 +112,10 @@
 			RelativePath="..\..\engines\drascula\rooms.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\talk.cpp">
+			RelativePath="..\..\engines\drascula\staticdata.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\texts.cpp">
+			RelativePath="..\..\engines\drascula\talk.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index 9f38585b8e..bb7eac35e0 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -346,6 +346,12 @@
 			RelativePath="..\..\engines\gob\util.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\variables.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\variables.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\video.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index aedfbe80f4..89cb1ff697 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -50,6 +50,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
@@ -105,6 +107,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
@@ -291,6 +295,12 @@
 				RelativePath="..\..\common\timer.h">
 			</File>
 			<File
+				RelativePath="..\..\common\unarj.cpp">
+			</File>
+			<File
+				RelativePath="..\..\common\unarj.h">
+			</File>
+			<File
 				RelativePath="..\..\common\unzip.cpp">
 			</File>
 			<File
diff --git a/dists/msvc71/drascula.vcproj b/dists/msvc71/drascula.vcproj
index 0d27422515..10a7a52185 100644
--- a/dists/msvc71/drascula.vcproj
+++ b/dists/msvc71/drascula.vcproj
@@ -126,10 +126,10 @@
 			RelativePath="..\..\engines\drascula\rooms.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\talk.cpp">
+			RelativePath="..\..\engines\drascula\staticdata.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\texts.cpp">
+			RelativePath="..\..\engines\drascula\talk.cpp">
 		</File>
 	</Files>
 	<Globals>
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
index cdd6c4dc75..3d6408cdf5 100644
--- a/dists/msvc71/gob.vcproj
+++ b/dists/msvc71/gob.vcproj
@@ -360,6 +360,12 @@
 			RelativePath="..\..\engines\gob\util.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\variables.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\variables.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\video.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 7b7b5b72c8..08102bd9b2 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -50,6 +50,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
@@ -111,6 +113,8 @@
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
 				Name="VCPostBuildEventTool"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
@@ -305,6 +309,12 @@
 				RelativePath="..\..\common\timer.h">
 			</File>
 			<File
+				RelativePath="..\..\common\unarj.cpp">
+			</File>
+			<File
+				RelativePath="..\..\common\unarj.h">
+			</File>
+			<File
 				RelativePath="..\..\common\unzip.cpp">
 			</File>
 			<File
diff --git a/dists/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj
index 7cf6065a4f..830eb8afe1 100644
--- a/dists/msvc8/drascula.vcproj
+++ b/dists/msvc8/drascula.vcproj
@@ -181,11 +181,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\talk.cpp"
+			RelativePath="..\..\engines\drascula\staticdata.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\texts.cpp"
+			RelativePath="..\..\engines\drascula\talk.cpp"
 			>
 		</File>
 	</Files>
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 62f7756c8a..c178caf8be 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -493,6 +493,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\variables.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\variables.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\video.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index a5cd6a9169..3dcaf09f83 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -97,6 +97,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -186,6 +189,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -425,6 +431,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\unarj.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\unarj.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\unzip.cpp"
 				>
 			</File>
diff --git a/dists/msvc9/drascula.vcproj b/dists/msvc9/drascula.vcproj
index 9eb8d5af9a..3bcda49e5d 100644
--- a/dists/msvc9/drascula.vcproj
+++ b/dists/msvc9/drascula.vcproj
@@ -182,11 +182,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\talk.cpp"
+			RelativePath="..\..\engines\drascula\staticdata.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\texts.cpp"
+			RelativePath="..\..\engines\drascula\talk.cpp"
 			>
 		</File>
 	</Files>
diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj
index 60cb8ddbc3..e6c55519b0 100644
--- a/dists/msvc9/gob.vcproj
+++ b/dists/msvc9/gob.vcproj
@@ -494,6 +494,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\variables.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\variables.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\video.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index d5904961a7..daf6ae6c99 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -100,6 +100,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -191,6 +194,9 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
@@ -430,6 +436,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\unarj.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\unarj.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\unzip.cpp"
 				>
 			</File>