From 043f92cb230f6afc83e5635cc1610c5d166e105f Mon Sep 17 00:00:00 2001
From: Kari Salminen
Date: Sat, 3 May 2008 13:01:58 +0000
Subject: Fix compilation on MSVC (Updated project files and turned a 'int
 forced to bool' warning off).

svn-id: r31840
---
 dists/msvc7/drascula.vcproj  |   5 +-
 dists/msvc7/kyra.vcproj      |  94 ++++++++++++++++++++++++--------------
 dists/msvc71/drascula.vcproj |   5 +-
 dists/msvc71/kyra.vcproj     |  94 ++++++++++++++++++++++++--------------
 dists/msvc8/drascula.vcproj  |   6 ++-
 dists/msvc8/kyra.vcproj      | 106 ++++++++++++++++++++++++++++---------------
 dists/msvc9/drascula.vcproj  |   6 ++-
 dists/msvc9/kyra.vcproj      | 106 ++++++++++++++++++++++++++++---------------
 engines/kyra/script_hof.cpp  |   2 +-
 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
@@ -96,6 +96,12 @@
 		</Configuration>
 	</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>
@@ -105,9 +111,6 @@
 		<File
 			RelativePath="..\..\engines\kyra\animator_v2.cpp">
 		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_v3.cpp">
-		</File>
 		<File
 			RelativePath="..\..\engines\kyra\debugger.cpp">
 		</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">
@@ -156,6 +162,18 @@
 		<File
 			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>
@@ -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">
@@ -201,15 +219,24 @@
 		<File
 			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>
@@ -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">
@@ -246,9 +273,6 @@
 		<File
 			RelativePath="..\..\engines\kyra\script_v2.cpp">
 		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v3.cpp">
-		</File>
 		<File
 			RelativePath="..\..\engines\kyra\seqplayer.cpp">
 		</File>
@@ -256,13 +280,13 @@
 			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
@@ -110,6 +110,12 @@
 	<References>
 	</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>
@@ -119,9 +125,6 @@
 		<File
 			RelativePath="..\..\engines\kyra\animator_v2.cpp">
 		</File>
-		<File
-			RelativePath="..\..\engines\kyra\animator_v3.cpp">
-		</File>
 		<File
 			RelativePath="..\..\engines\kyra\debugger.cpp">
 		</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">
@@ -170,6 +176,18 @@
 		<File
 			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>
@@ -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">
@@ -215,15 +233,24 @@
 		<File
 			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>
@@ -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">
@@ -260,9 +287,6 @@
 		<File
 			RelativePath="..\..\engines\kyra\script_v2.cpp">
 		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v3.cpp">
-		</File>
 		<File
 			RelativePath="..\..\engines\kyra\seqplayer.cpp">
 		</File>
@@ -270,13 +294,13 @@
 			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
@@ -240,6 +248,22 @@
 			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"
 			>
@@ -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
@@ -360,10 +396,6 @@
 			RelativePath="..\..\engines\kyra\script_v2.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v3.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\kyra\seqplayer.cpp"
 			>
@@ -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
@@ -241,6 +249,22 @@
 			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"
 			>
@@ -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
@@ -361,10 +397,6 @@
 			RelativePath="..\..\engines\kyra\script_v2.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\kyra\script_v3.cpp"
-			>
-		</File>
 		<File
 			RelativePath="..\..\engines\kyra\seqplayer.cpp"
 			>
@@ -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;
 }
-- 
cgit v1.2.3