Merged revisions 32564-32565,32567-32575,32577,32579-32594,32596-32603,32605-32639,32644-32646,32648-32666 via svnmerge from

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

svn-id: r32667

6 files changed, 102 insertions, 4 deletions

diff --git a/dists/engine-data/drascula.dat b/dists/engine-data/drascula.dat
new file mode 100644
index 0000000000..321e63c277
--- /dev/null
+++ b/dists/engine-data/drascula.dat
diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj
index 3bf3cf94ea..2d23296dbc 100644
--- a/dists/msvc7/drascula.vcproj
+++ b/dists/msvc7/drascula.vcproj
@@ -97,9 +97,15 @@
 	</Configurations>
 	<Files>
 		<File
+			RelativePath="..\..\engines\drascula\actors.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\animation.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\converse.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\detection.cpp">
 		</File>
 		<File
@@ -109,10 +115,25 @@
 			RelativePath="..\..\engines\drascula\drascula.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\graphics.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\interface.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\objects.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\palette.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\rooms.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\staticdata.h">
+			RelativePath="..\..\engines\drascula\saveload.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\sound.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\drascula\talk.cpp">
diff --git a/dists/msvc71/drascula.vcproj b/dists/msvc71/drascula.vcproj
index 10a7a52185..9160a02bbf 100644
--- a/dists/msvc71/drascula.vcproj
+++ b/dists/msvc71/drascula.vcproj
@@ -111,9 +111,15 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\drascula\actors.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\animation.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\converse.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\detection.cpp">
 		</File>
 		<File
@@ -123,10 +129,25 @@
 			RelativePath="..\..\engines\drascula\drascula.h">
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\graphics.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\interface.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\objects.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\palette.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\rooms.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\staticdata.h">
+			RelativePath="..\..\engines\drascula\saveload.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\sound.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\drascula\talk.cpp">
diff --git a/dists/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj
index 830eb8afe1..0867377f31 100644
--- a/dists/msvc8/drascula.vcproj
+++ b/dists/msvc8/drascula.vcproj
@@ -161,10 +161,18 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\drascula\actors.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\animation.cpp"
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\converse.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\detection.cpp"
 			>
 		</File>
@@ -177,11 +185,31 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\graphics.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\interface.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\objects.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\palette.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\rooms.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\staticdata.h"
+			RelativePath="..\..\engines\drascula\saveload.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\sound.cpp"
 			>
 		</File>
 		<File
diff --git a/dists/msvc9/drascula.vcproj b/dists/msvc9/drascula.vcproj
index 3bcda49e5d..45a75cb7a2 100644
--- a/dists/msvc9/drascula.vcproj
+++ b/dists/msvc9/drascula.vcproj
@@ -162,10 +162,18 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\drascula\actors.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\animation.cpp"
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\converse.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\detection.cpp"
 			>
 		</File>
@@ -178,11 +186,31 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\drascula\graphics.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\interface.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\objects.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\palette.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\rooms.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\staticdata.h"
+			RelativePath="..\..\engines\drascula\saveload.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\sound.cpp"
 			>
 		</File>
 		<File
diff --git a/dists/wii/icon.png b/dists/wii/icon.png
index dc873e66f2..0a3264377f 100644
--- a/dists/wii/icon.png
+++ b/dists/wii/icon.png