aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dists/msvc7/drascula.vcproj5
-rw-r--r--dists/msvc7/kyra.vcproj94
-rw-r--r--dists/msvc71/drascula.vcproj5
-rw-r--r--dists/msvc71/kyra.vcproj94
-rw-r--r--dists/msvc8/drascula.vcproj6
-rw-r--r--dists/msvc8/kyra.vcproj106
-rw-r--r--dists/msvc9/drascula.vcproj6
-rw-r--r--dists/msvc9/kyra.vcproj106
-rw-r--r--engines/kyra/script_hof.cpp2
9 files changed, 275 insertions, 149 deletions
diff --git a/dists/msvc7/drascula.vcproj b/dists/msvc7/drascula.vcproj
index fe46263499..8a55a1856b 100644
--- a/dists/msvc7/drascula.vcproj
+++ b/dists/msvc7/drascula.vcproj
@@ -112,7 +112,10 @@
RelativePath="..\..\engines\drascula\rooms.cpp">
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h">
+ RelativePath="..\..\engines\drascula\talk.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp">
</File>
</Files>
<Globals>
diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj
index 7e5abba0b5..508a2ead73 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
@@ -142,13 +145,16 @@
RelativePath="..\..\engines\kyra\gui_v3.h">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp">
+ RelativePath="..\..\engines\kyra\items_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v2.cpp">
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
+ </File>
+ <File
+ 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">
@@ -157,6 +163,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
@@ -169,31 +187,31 @@
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\saveload_v3.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\scene_v1.cpp">
@@ -202,15 +220,24 @@
RelativePath="..\..\engines\kyra\scene_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\screen.cpp">
</File>
<File
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
@@ -223,16 +250,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">
@@ -247,22 +274,19 @@
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\sound.cpp">
@@ -298,19 +322,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">
@@ -319,13 +343,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/drascula.vcproj b/dists/msvc71/drascula.vcproj
index e2147f7a87..0d27422515 100644
--- a/dists/msvc71/drascula.vcproj
+++ b/dists/msvc71/drascula.vcproj
@@ -126,7 +126,10 @@
RelativePath="..\..\engines\drascula\rooms.cpp">
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h">
+ RelativePath="..\..\engines\drascula\talk.cpp">
+ </File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp">
</File>
</Files>
<Globals>
diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj
index d711e121ea..4fceb15a9d 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
@@ -156,13 +159,16 @@
RelativePath="..\..\engines\kyra\gui_v3.h">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp">
+ RelativePath="..\..\engines\kyra\items_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\items_v2.cpp">
+ RelativePath="..\..\engines\kyra\items_mr.cpp">
+ </File>
+ <File
+ 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">
@@ -171,6 +177,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
@@ -183,31 +201,31 @@
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\saveload_v3.cpp">
+ RelativePath="..\..\engines\kyra\scene_hof.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp">
+ RelativePath="..\..\engines\kyra\scene_mr.cpp">
</File>
<File
RelativePath="..\..\engines\kyra\scene_v1.cpp">
@@ -216,15 +234,24 @@
RelativePath="..\..\engines\kyra\scene_v2.cpp">
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp">
- </File>
- <File
RelativePath="..\..\engines\kyra\screen.cpp">
</File>
<File
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
@@ -237,16 +264,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">
@@ -261,22 +288,19 @@
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\sound.cpp">
@@ -312,19 +336,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">
@@ -333,13 +357,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/msvc8/drascula.vcproj b/dists/msvc8/drascula.vcproj
index f90684c535..7cf6065a4f 100644
--- a/dists/msvc8/drascula.vcproj
+++ b/dists/msvc8/drascula.vcproj
@@ -181,7 +181,11 @@
>
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h"
+ RelativePath="..\..\engines\drascula\talk.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp"
>
</File>
</Files>
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index be73de0e5d..cbd876a19e 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
@@ -221,15 +225,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp"
+ RelativePath="..\..\engines\kyra\items_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v2.cpp"
+ RelativePath="..\..\engines\kyra\items_mr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\items_v1.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v3.cpp"
+ RelativePath="..\..\engines\kyra\items_v2.cpp"
>
</File>
<File
@@ -241,6 +249,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>
@@ -257,23 +281,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
@@ -281,15 +305,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v2.cpp"
+ RelativePath="..\..\engines\kyra\scene.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v3.cpp"
+ RelativePath="..\..\engines\kyra\scene_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp"
+ RelativePath="..\..\engines\kyra\scene_mr.cpp"
>
</File>
<File
@@ -301,15 +325,27 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp"
+ RelativePath="..\..\engines\kyra\screen.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.cpp"
+ RelativePath="..\..\engines\kyra\screen.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.h"
+ 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
@@ -329,19 +365,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
@@ -361,10 +397,6 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp"
- >
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp"
>
</File>
@@ -373,15 +405,15 @@
>
</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
@@ -429,23 +461,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
@@ -457,15 +489,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/drascula.vcproj b/dists/msvc9/drascula.vcproj
index 8849b063b8..9eb8d5af9a 100644
--- a/dists/msvc9/drascula.vcproj
+++ b/dists/msvc9/drascula.vcproj
@@ -182,7 +182,11 @@
>
</File>
<File
- RelativePath="..\..\engines\drascula\texts.h"
+ RelativePath="..\..\engines\drascula\talk.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\drascula\texts.cpp"
>
</File>
</Files>
diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj
index d057cb5df2..6b198f4094 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
@@ -222,15 +226,19 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v1.cpp"
+ RelativePath="..\..\engines\kyra\items_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v2.cpp"
+ RelativePath="..\..\engines\kyra\items_mr.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\engines\kyra\items_v1.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\items_v3.cpp"
+ RelativePath="..\..\engines\kyra\items_v2.cpp"
>
</File>
<File
@@ -242,6 +250,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>
@@ -258,23 +282,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
@@ -282,15 +306,15 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v2.cpp"
+ RelativePath="..\..\engines\kyra\scene.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\saveload_v3.cpp"
+ RelativePath="..\..\engines\kyra\scene_hof.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene.cpp"
+ RelativePath="..\..\engines\kyra\scene_mr.cpp"
>
</File>
<File
@@ -302,15 +326,27 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\scene_v3.cpp"
+ RelativePath="..\..\engines\kyra\screen.cpp"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.cpp"
+ RelativePath="..\..\engines\kyra\screen.h"
>
</File>
<File
- RelativePath="..\..\engines\kyra\screen.h"
+ 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
@@ -330,19 +366,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
@@ -362,10 +398,6 @@
>
</File>
<File
- RelativePath="..\..\engines\kyra\script_v3.cpp"
- >
- </File>
- <File
RelativePath="..\..\engines\kyra\seqplayer.cpp"
>
</File>
@@ -374,15 +406,15 @@
>
</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
@@ -430,23 +462,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
@@ -458,15 +490,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/engines/kyra/script_hof.cpp b/engines/kyra/script_hof.cpp
index d4960de007..af10106fd3 100644
--- a/engines/kyra/script_hof.cpp
+++ b/engines/kyra/script_hof.cpp
@@ -649,7 +649,7 @@ int KyraEngine_HoF::o2_restoreBackBuffer(EMCState *script) {
restorePage3();
if (disable)
- _animObjects[0].enabled = oldState;
+ _animObjects[0].enabled = (oldState != 0);
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 00:04:54 +0000