Merged revisions 31972-31973,31975-31981,31984-31989,31993-31994,31996-32014,32016-32020,32022-32025,32027-32028,32030,32034,32037-32038,32040-32058,32060-32087,32089-32093,32095-32123 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

svn-id: r32125

1 files changed, 33 insertions, 30 deletions

diff --git a/dists/msvc7/kyra.vcproj b/dists/msvc7/kyra.vcproj
index decc992b81..d547288d21 100644
--- a/dists/msvc7/kyra.vcproj
+++ b/dists/msvc7/kyra.vcproj
@@ -100,13 +100,13 @@
 			RelativePath="..\..\engines\kyra\animator_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_mr.cpp">
+			RelativePath="..\..\engines\kyra\animator_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_v1.cpp">
+			RelativePath="..\..\engines\kyra\animator_lok.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\animator_v1.h">
+			RelativePath="..\..\engines\kyra\animator_mr.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\animator_v2.cpp">
@@ -133,16 +133,16 @@
 			RelativePath="..\..\engines\kyra\gui_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_mr.cpp">
+			RelativePath="..\..\engines\kyra\gui_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_mr.h">
+			RelativePath="..\..\engines\kyra\gui_lok.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_v1.cpp">
+			RelativePath="..\..\engines\kyra\gui_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\gui_v1.h">
+			RelativePath="..\..\engines\kyra\gui_mr.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\gui_v2.cpp">
@@ -154,25 +154,25 @@
 			RelativePath="..\..\engines\kyra\items_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_mr.cpp">
+			RelativePath="..\..\engines\kyra\items_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\items_v1.cpp">
+			RelativePath="..\..\engines\kyra\items_mr.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\items_v2.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra.cpp">
+			RelativePath="..\..\engines\kyra\kyra_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra.h">
+			RelativePath="..\..\engines\kyra\kyra_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.cpp">
+			RelativePath="..\..\engines\kyra\kyra_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\kyra_hof.h">
+			RelativePath="..\..\engines\kyra\kyra_lok.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\kyra_mr.cpp">
@@ -205,16 +205,16 @@
 			RelativePath="..\..\engines\kyra\saveload_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload_mr.cpp">
+			RelativePath="..\..\engines\kyra\saveload_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\saveload_v1.cpp">
+			RelativePath="..\..\engines\kyra\saveload_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene.cpp">
+			RelativePath="..\..\engines\kyra\scene_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\scene_hof.cpp">
+			RelativePath="..\..\engines\kyra\scene_lok.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\scene_mr.cpp">
@@ -238,16 +238,16 @@
 			RelativePath="..\..\engines\kyra\screen_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_mr.cpp">
+			RelativePath="..\..\engines\kyra\screen_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_mr.h">
+			RelativePath="..\..\engines\kyra\screen_lok.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_v1.cpp">
+			RelativePath="..\..\engines\kyra\screen_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\screen_v1.h">
+			RelativePath="..\..\engines\kyra\screen_mr.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\screen_v2.cpp">
@@ -265,6 +265,9 @@
 			RelativePath="..\..\engines\kyra\script_hof.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\script_lok.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\script_mr.cpp">
 		</File>
 		<File
@@ -289,10 +292,10 @@
 			RelativePath="..\..\engines\kyra\sequences_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_mr.cpp">
+			RelativePath="..\..\engines\kyra\sequences_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sequences_v1.cpp">
+			RelativePath="..\..\engines\kyra\sequences_mr.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\sequences_v2.cpp">
@@ -310,10 +313,10 @@
 			RelativePath="..\..\engines\kyra\sound_digital.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound_towns.cpp">
+			RelativePath="..\..\engines\kyra\sound_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\sound_v1.cpp">
+			RelativePath="..\..\engines\kyra\sound_towns.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\sprites.cpp">
@@ -337,13 +340,13 @@
 			RelativePath="..\..\engines\kyra\text_hof.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_mr.cpp">
+			RelativePath="..\..\engines\kyra\text_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_mr.h">
+			RelativePath="..\..\engines\kyra\text_mr.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\text_v1.cpp">
+			RelativePath="..\..\engines\kyra\text_mr.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\timer.cpp">
@@ -355,10 +358,10 @@
 			RelativePath="..\..\engines\kyra\timer_hof.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_mr.cpp">
+			RelativePath="..\..\engines\kyra\timer_lok.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\kyra\timer_v1.cpp">
+			RelativePath="..\..\engines\kyra\timer_mr.cpp">
 		</File>
 		<File
 			RelativePath="..\..\engines\kyra\vqa.cpp">