Merge with trunk, using the svnmerge tool

svn-id: r31898

4 files changed, 116 insertions, 40 deletions

diff --git a/dists/msvc9/drascula.vcproj b/dists/msvc9/drascula.vcproj
index f5d37792b5..9eb8d5af9a 100644
--- a/dists/msvc9/drascula.vcproj
+++ b/dists/msvc9/drascula.vcproj
@@ -162,6 +162,10 @@
 	</References>
 	<Files>
 		<File
+			RelativePath="..\..\engines\drascula\animation.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\drascula\detection.cpp"
 			>
 		</File>
@@ -174,7 +178,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\drascula\texts.h"
+			RelativePath="..\..\engines\drascula\rooms.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\talk.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\drascula\texts.cpp"
 			>
 		</File>
 	</Files>
diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj
index a8ab1969bc..a409f5dd82 100644
--- a/dists/msvc9/gob.vcproj
+++ b/dists/msvc9/gob.vcproj
@@ -270,6 +270,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\goblin_v4.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\init.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj
index 833ee4cc13..b004e9463e 100644
--- a/dists/msvc9/kyra.vcproj
+++ b/dists/msvc9/kyra.vcproj
@@ -162,19 +162,23 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\kyra\animator_v1.cpp"
+			RelativePath="..\..\engines\kyra\animator_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_v1.h"
+			RelativePath="..\..\engines\kyra\animator_mr.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_v2.cpp"
+			RelativePath="..\..\engines\kyra\animator_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\animator_v1.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_v3.cpp"
+			RelativePath="..\..\engines\kyra\animator_v2.cpp"
 			>
 		</File>
 		<File
@@ -198,6 +202,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\gui_hof.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\gui_hof.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\gui_mr.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\gui_mr.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\gui_v1.cpp"
 			>
 		</File>
@@ -214,19 +234,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_v3.cpp"
+			RelativePath="..\..\engines\kyra\items_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_v1.cpp"
+			RelativePath="..\..\engines\kyra\items_mr.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_v2.cpp"
+			RelativePath="..\..\engines\kyra\items_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_v3.cpp"
+			RelativePath="..\..\engines\kyra\items_v2.cpp"
 			>
 		</File>
 		<File
@@ -238,6 +258,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\kyra_hof.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\kyra_hof.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\kyra_mr.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\kyra_mr.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\kyra_v1.cpp"
 			>
 		</File>
@@ -254,23 +290,23 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_v3.cpp"
+			RelativePath="..\..\engines\kyra\resource.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_v3.h"
+			RelativePath="..\..\engines\kyra\resource.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\resource.cpp"
+			RelativePath="..\..\engines\kyra\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\resource.h"
+			RelativePath="..\..\engines\kyra\saveload_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload.cpp"
+			RelativePath="..\..\engines\kyra\saveload_mr.cpp"
 			>
 		</File>
 		<File
@@ -278,23 +314,23 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload_v2.cpp"
+			RelativePath="..\..\engines\kyra\scene.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene.cpp"
+			RelativePath="..\..\engines\kyra\scene_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_v1.cpp"
+			RelativePath="..\..\engines\kyra\scene_mr.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_v2.cpp"
+			RelativePath="..\..\engines\kyra\scene_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_v3.cpp"
+			RelativePath="..\..\engines\kyra\scene_v2.cpp"
 			>
 		</File>
 		<File
@@ -306,6 +342,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\screen_hof.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\screen_hof.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\screen_mr.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\kyra\screen_mr.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\screen_v1.cpp"
 			>
 		</File>
@@ -322,19 +374,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_v3.cpp"
+			RelativePath="..\..\engines\kyra\script.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_v3.h"
+			RelativePath="..\..\engines\kyra\script.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script.cpp"
+			RelativePath="..\..\engines\kyra\script_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script.h"
+			RelativePath="..\..\engines\kyra\script_mr.cpp"
 			>
 		</File>
 		<File
@@ -354,27 +406,27 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\script_v3.cpp"
+			RelativePath="..\..\engines\kyra\seqplayer.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\seqplayer.cpp"
+			RelativePath="..\..\engines\kyra\seqplayer.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\seqplayer.h"
+			RelativePath="..\..\engines\kyra\sequences_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_v1.cpp"
+			RelativePath="..\..\engines\kyra\sequences_mr.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_v2.cpp"
+			RelativePath="..\..\engines\kyra\sequences_v1.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_v3.cpp"
+			RelativePath="..\..\engines\kyra\sequences_v2.cpp"
 			>
 		</File>
 		<File
@@ -422,23 +474,23 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_v1.cpp"
+			RelativePath="..\..\engines\kyra\text_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_v2.cpp"
+			RelativePath="..\..\engines\kyra\text_hof.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_v2.h"
+			RelativePath="..\..\engines\kyra\text_mr.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_v3.cpp"
+			RelativePath="..\..\engines\kyra\text_mr.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_v3.h"
+			RelativePath="..\..\engines\kyra\text_v1.cpp"
 			>
 		</File>
 		<File
@@ -450,15 +502,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_v1.cpp"
+			RelativePath="..\..\engines\kyra\timer_hof.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_v2.cpp"
+			RelativePath="..\..\engines\kyra\timer_mr.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_v3.cpp"
+			RelativePath="..\..\engines\kyra\timer_v1.cpp"
 			>
 		</File>
 		<File
diff --git a/dists/msvc9/made.vcproj b/dists/msvc9/made.vcproj
index ebb3323bc2..17b619911f 100644
--- a/dists/msvc9/made.vcproj
+++ b/dists/msvc9/made.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"
@@ -238,11 +238,19 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.cpp"
+			RelativePath="..\..\engines\made\scriptfuncs.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h"
+			RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp"
 			>
 		</File>
 		<File