aboutsummaryrefslogtreecommitdiff
path: root/dists
diff options
context:
space:
mode:
Diffstat (limited to 'dists')
-rw-r--r--dists/msvc7/drascula.vcproj11
-rw-r--r--dists/msvc7/gob.vcproj3
-rw-r--r--dists/msvc7/kyra.vcproj109
-rw-r--r--dists/msvc7/made.vcproj12
-rw-r--r--dists/msvc71/drascula.vcproj11
-rw-r--r--dists/msvc71/gob.vcproj3
-rw-r--r--dists/msvc71/kyra.vcproj109
-rw-r--r--dists/msvc71/made.vcproj12
-rw-r--r--dists/msvc8/drascula.vcproj14
-rw-r--r--dists/msvc8/gob.vcproj4
-rw-r--r--dists/msvc8/kyra.vcproj124
-rw-r--r--dists/msvc8/made.vcproj14
-rw-r--r--dists/msvc9/drascula.vcproj14
-rw-r--r--dists/msvc9/gob.vcproj4
-rw-r--r--dists/msvc9/kyra.vcproj124
-rw-r--r--dists/msvc9/made.vcproj14
16 files changed, 424 insertions, 158 deletions
diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj
index dce4edc34f..8a55a1856b 100644
--- a/dists/msvc7/drascula.vcproj
+++ b/dists/msvc7/drascula.vcproj
@@ -97,6 +97,9 @@
</Configurations>
<Files>
<File
+ RelativePath="..\..\engines\drascula\animation.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\drascula\detection.cpp">
</File>
<File
@@ -106,7 +109,13 @@
RelativePath="..\..\engines\drascula\drascula.h">
</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>
<Globals>
diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index 8cb584d212..a8c856ce17 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -178,6 +178,9 @@
RelativePath="..\..\engines\gob\goblin_v3.cpp">
</File>
<File
+ RelativePath="..\..\engines\gob\goblin_v4.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\gob\init.cpp">
</File>
<File
diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj
index bdec3e74e0..decc992b81 100644
--- a/dists/msvc7/kyra.vcproj
+++ b/dists/msvc7/kyra.vcproj
@@ -97,6 +97,12 @@
</Configurations>
<Files>
<File
+ RelativePath="..\..\engines\kyra\animator_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\animator_mr.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\animator_v1.cpp">
</File>
<File
@@ -106,9 +112,6 @@
RelativePath="..\..\engines\kyra\animator_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\debugger.cpp">
</File>
<File
@@ -124,6 +127,18 @@
RelativePath="..\..\engines\kyra\gui.h">
</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>
<File
@@ -136,16 +151,16 @@
RelativePath="..\..\engines\kyra\gui_v2.h">
</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
RelativePath="..\..\engines\kyra\kyra.cpp">
@@ -154,6 +169,18 @@
RelativePath="..\..\engines\kyra\kyra.h">
</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>
<File
@@ -166,37 +193,37 @@
RelativePath="..\..\engines\kyra\kyra_v2.h">
</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
RelativePath="..\..\engines\kyra\saveload_v1.cpp">
</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
RelativePath="..\..\engines\kyra\screen.cpp">
@@ -205,6 +232,18 @@
RelativePath="..\..\engines\kyra\screen.h">
</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>
<File
@@ -217,16 +256,16 @@
RelativePath="..\..\engines\kyra\screen_v2.h">
</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
RelativePath="..\..\engines\kyra\script_tim.cpp">
@@ -241,22 +280,22 @@
RelativePath="..\..\engines\kyra\script_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\seqplayer.h">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v2.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v3.cpp">
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\sequences_v2.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sound.cpp">
@@ -292,19 +331,19 @@
RelativePath="..\..\engines\kyra\text.h">
</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
RelativePath="..\..\engines\kyra\timer.cpp">
@@ -313,13 +352,13 @@
RelativePath="..\..\engines\kyra\timer.h">
</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
RelativePath="..\..\engines\kyra\vqa.cpp">
diff --git a/dists/msvc7/made.vcproj b/dists/msvc7/made.vcproj
index f765eb8a94..6f4caa8154 100644
--- a/dists/msvc7/made.vcproj
+++ b/dists/msvc7/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="7.00"
@@ -154,10 +154,16 @@
RelativePath="..\..\engines\made\script.h">
</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
RelativePath="..\..\engines\made\sound.cpp">
diff --git a/dists/msvc71/drascula.vcproj b/dists/msvc71/drascula.vcproj
index ab6fc2d147..0d27422515 100644
--- a/dists/msvc71/drascula.vcproj
+++ b/dists/msvc71/drascula.vcproj
@@ -111,6 +111,9 @@
</References>
<Files>
<File
+ RelativePath="..\..\engines\drascula\animation.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\drascula\detection.cpp">
</File>
<File
@@ -120,7 +123,13 @@
RelativePath="..\..\engines\drascula\drascula.h">
</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>
<Globals>
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
index 4eb147fba9..ac8960b28c 100644
--- a/dists/msvc71/gob.vcproj
+++ b/dists/msvc71/gob.vcproj
@@ -192,6 +192,9 @@
RelativePath="..\..\engines\gob\goblin_v3.cpp">
</File>
<File
+ RelativePath="..\..\engines\gob\goblin_v4.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\gob\init.cpp">
</File>
<File
diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj
index 837f167ade..3992223f50 100644
--- a/dists/msvc71/kyra.vcproj
+++ b/dists/msvc71/kyra.vcproj
@@ -111,6 +111,12 @@
</References>
<Files>
<File
+ RelativePath="..\..\engines\kyra\animator_hof.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\animator_mr.cpp">
+ </File>
+ <File
RelativePath="..\..\engines\kyra\animator_v1.cpp">
</File>
<File
@@ -120,9 +126,6 @@
RelativePath="..\..\engines\kyra\animator_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\animator_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\debugger.cpp">
</File>
<File
@@ -138,6 +141,18 @@
RelativePath="..\..\engines\kyra\gui.h">
</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>
<File
@@ -150,16 +165,16 @@
RelativePath="..\..\engines\kyra\gui_v2.h">
</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
RelativePath="..\..\engines\kyra\kyra.cpp">
@@ -168,6 +183,18 @@
RelativePath="..\..\engines\kyra\kyra.h">
</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>
<File
@@ -180,37 +207,37 @@
RelativePath="..\..\engines\kyra\kyra_v2.h">
</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
RelativePath="..\..\engines\kyra\saveload_v1.cpp">
</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
RelativePath="..\..\engines\kyra\screen.cpp">
@@ -219,6 +246,18 @@
RelativePath="..\..\engines\kyra\screen.h">
</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>
<File
@@ -231,16 +270,16 @@
RelativePath="..\..\engines\kyra\screen_v2.h">
</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
RelativePath="..\..\engines\kyra\script_tim.cpp">
@@ -255,22 +294,22 @@
RelativePath="..\..\engines\kyra\script_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\seqplayer.h">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ RelativePath="..\..\engines\kyra\sequences_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v2.cpp">
+ RelativePath="..\..\engines\kyra\sequences_mr.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\sequences_v3.cpp">
+ RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\sequences_v2.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\sound.cpp">
@@ -306,19 +345,19 @@
RelativePath="..\..\engines\kyra\text.h">
</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
RelativePath="..\..\engines\kyra\timer.cpp">
@@ -327,13 +366,13 @@
RelativePath="..\..\engines\kyra\timer.h">
</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
RelativePath="..\..\engines\kyra\vqa.cpp">
diff --git a/dists/msvc71/made.vcproj b/dists/msvc71/made.vcproj
index 158fb5e277..1ddc1ce245 100644
--- a/dists/msvc71/made.vcproj
+++ b/dists/msvc71/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="7.10"
@@ -168,10 +168,16 @@
RelativePath="..\..\engines\made\script.h">
</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
RelativePath="..\..\engines\made\sound.cpp">
diff --git a/dists/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj
index d7a9f90d02..7cf6065a4f 100644
--- a/dists/msvc8/drascula.vcproj
+++ b/dists/msvc8/drascula.vcproj
@@ -161,6 +161,10 @@
</References>
<Files>
<File
+ RelativePath="..\..\engines\drascula\animation.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\drascula\detection.cpp"
>
</File>
@@ -173,7 +177,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/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index b122f3b3c0..04858f540e 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -269,6 +269,10 @@
>
</File>
<File
+ RelativePath="..\..\engines\gob\goblin_v4.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\engines\gob\init.cpp"
>
</File>
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index 94e2724827..d173914b59 100644
--- a/dists/msvc8/kyra.vcproj
+++ b/dists/msvc8/kyra.vcproj
@@ -161,19 +161,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
@@ -197,6 +201,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>
@@ -213,19 +233,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
@@ -237,6 +257,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>
@@ -253,23 +289,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
@@ -277,23 +313,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
@@ -305,6 +341,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>
@@ -321,19 +373,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
@@ -353,27 +405,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
@@ -421,23 +473,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
@@ -449,15 +501,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/msvc8/made.vcproj b/dists/msvc8/made.vcproj
index c2c226ff75..7f7ec6e454 100644
--- a/dists/msvc8/made.vcproj
+++ b/dists/msvc8/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="8,00"
@@ -237,11 +237,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
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