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 ++++++++++++++++++++++++++++-----------------
 2 files changed, 63 insertions(+), 36 deletions(-)

(limited to 'dists/msvc7')

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">
-- 
cgit v1.2.3