Fix compilation on MSVC (Updated project files and turned a 'int forced to bool' warning off).

svn-id: r31840

2 files changed, 74 insertions, 38 deletions

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