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

svn-id: r31840

2 files changed, 63 insertions, 36 deletions

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">