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

22 files changed, 219 insertions, 148 deletions

diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index ddf13e1e5c..c1504ebba8 100644
--- a/dists/engine-data/kyra.dat
+++ b/dists/engine-data/kyra.dat
diff --git a/dists/msvc7/gob.vcproj b/dists/msvc7/gob.vcproj
index c466b2b243..9f38585b8e 100644
--- a/dists/msvc7/gob.vcproj
+++ b/dists/msvc7/gob.vcproj
@@ -325,6 +325,9 @@
 			RelativePath="..\..\engines\gob\saveload_v3.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\saveload_v4.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\scenery.cpp">
 		</File>
 		<File
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">
diff --git a/dists/msvc7/made.vcproj b/dists/msvc7/made.vcproj
index 6f4caa8154..757d46aa23 100644
--- a/dists/msvc7/made.vcproj
+++ b/dists/msvc7/made.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.00"
@@ -148,22 +148,22 @@
 			RelativePath="..\..\engines\made\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.cpp">
+			RelativePath="..\..\engines\made\screenfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.h">
+			RelativePath="..\..\engines\made\screenfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h">
+			RelativePath="..\..\engines\made\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp">
+			RelativePath="..\..\engines\made\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp">
+			RelativePath="..\..\engines\made\scriptfuncs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp">
+			RelativePath="..\..\engines\made\scriptfuncs.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\made\sound.cpp">
diff --git a/dists/msvc7/parallaction.vcproj b/dists/msvc7/parallaction.vcproj
index 0d802e5667..79ac169995 100644
--- a/dists/msvc7/parallaction.vcproj
+++ b/dists/msvc7/parallaction.vcproj
@@ -148,6 +148,12 @@
 			RelativePath="..\..\engines\parallaction\gui_ns.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\input.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\input.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\inventory.cpp">
 		</File>
 		<File
diff --git a/dists/msvc7/scummvm.vcproj b/dists/msvc7/scummvm.vcproj
index f39a682cd9..55358a2cc6 100644
--- a/dists/msvc7/scummvm.vcproj
+++ b/dists/msvc7/scummvm.vcproj
@@ -386,6 +386,9 @@
 				RelativePath="..\..\sound\midiparser_xmidi.cpp">
 			</File>
 			<File
+				RelativePath="..\..\sound\midiplugin.h">
+			</File>
+			<File
 				RelativePath="..\..\sound\mixer.cpp">
 			</File>
 			<File
diff --git a/dists/msvc71/gob.vcproj b/dists/msvc71/gob.vcproj
index cb897cb655..cdd6c4dc75 100644
--- a/dists/msvc71/gob.vcproj
+++ b/dists/msvc71/gob.vcproj
@@ -339,6 +339,9 @@
 			RelativePath="..\..\engines\gob\saveload_v3.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\saveload_v4.cpp">
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\scenery.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/kyra.vcproj b/dists/msvc71/kyra.vcproj
index 3992223f50..f37b1d85fc 100644
--- a/dists/msvc71/kyra.vcproj
+++ b/dists/msvc71/kyra.vcproj
@@ -114,13 +114,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">
@@ -147,16 +147,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">
@@ -168,25 +168,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">
@@ -219,16 +219,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">
@@ -252,16 +252,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">
@@ -279,6 +279,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
@@ -303,10 +306,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">
@@ -324,10 +327,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">
@@ -351,13 +354,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">
@@ -369,10 +372,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">
diff --git a/dists/msvc71/made.vcproj b/dists/msvc71/made.vcproj
index 1ddc1ce245..5d0dd621e8 100644
--- a/dists/msvc71/made.vcproj
+++ b/dists/msvc71/made.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="7.10"
@@ -162,22 +162,22 @@
 			RelativePath="..\..\engines\made\screen.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.cpp">
+			RelativePath="..\..\engines\made\screenfx.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.h">
+			RelativePath="..\..\engines\made\screenfx.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h">
+			RelativePath="..\..\engines\made\script.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp">
+			RelativePath="..\..\engines\made\script.h">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp">
+			RelativePath="..\..\engines\made\scriptfuncs.cpp">
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp">
+			RelativePath="..\..\engines\made\scriptfuncs.h">
 		</File>
 		<File
 			RelativePath="..\..\engines\made\sound.cpp">
diff --git a/dists/msvc71/parallaction.vcproj b/dists/msvc71/parallaction.vcproj
index 0d5369d54e..440e7123e8 100644
--- a/dists/msvc71/parallaction.vcproj
+++ b/dists/msvc71/parallaction.vcproj
@@ -162,6 +162,12 @@
 			RelativePath="..\..\engines\parallaction\gui_ns.cpp">
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\input.cpp">
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\input.h">
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\inventory.cpp">
 		</File>
 		<File
diff --git a/dists/msvc71/scummvm.vcproj b/dists/msvc71/scummvm.vcproj
index 5cab91dd7f..5e1100b788 100644
--- a/dists/msvc71/scummvm.vcproj
+++ b/dists/msvc71/scummvm.vcproj
@@ -400,6 +400,9 @@
 				RelativePath="..\..\sound\midiparser_xmidi.cpp">
 			</File>
 			<File
+				RelativePath="..\..\sound\midiplugin.h">
+			</File>
+			<File
 				RelativePath="..\..\sound\mixer.cpp">
 			</File>
 			<File
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 560e265eec..62f7756c8a 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -465,6 +465,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\saveload_v4.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\scenery.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/kyra.vcproj b/dists/msvc8/kyra.vcproj
index d173914b59..c99abdc5bc 100644
--- a/dists/msvc8/kyra.vcproj
+++ b/dists/msvc8/kyra.vcproj
@@ -165,15 +165,15 @@
 			>
 		</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
@@ -209,19 +209,19 @@
 			>
 		</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
@@ -237,11 +237,11 @@
 			>
 		</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
@@ -249,19 +249,19 @@
 			>
 		</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
@@ -305,19 +305,19 @@
 			>
 		</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
@@ -349,19 +349,19 @@
 			>
 		</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
@@ -385,6 +385,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\script_lok.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\script_mr.cpp"
 			>
 		</File>
@@ -417,11 +421,11 @@
 			>
 		</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
@@ -445,11 +449,11 @@
 			>
 		</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
@@ -481,15 +485,15 @@
 			>
 		</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
@@ -505,11 +509,11 @@
 			>
 		</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
diff --git a/dists/msvc8/made.vcproj b/dists/msvc8/made.vcproj
index 7f7ec6e454..b3c309b334 100644
--- a/dists/msvc8/made.vcproj
+++ b/dists/msvc8/made.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
@@ -229,27 +229,27 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.cpp"
+			RelativePath="..\..\engines\made\screenfx.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.h"
+			RelativePath="..\..\engines\made\screenfx.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h"
+			RelativePath="..\..\engines\made\script.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp"
+			RelativePath="..\..\engines\made\script.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp"
+			RelativePath="..\..\engines\made\scriptfuncs.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp"
+			RelativePath="..\..\engines\made\scriptfuncs.h"
 			>
 		</File>
 		<File
diff --git a/dists/msvc8/parallaction.vcproj b/dists/msvc8/parallaction.vcproj
index 0e2b0a761a..21a6d3bab3 100644
--- a/dists/msvc8/parallaction.vcproj
+++ b/dists/msvc8/parallaction.vcproj
@@ -229,6 +229,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\input.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\input.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\inventory.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index 40c455eb8a..db5c10efd3 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -551,6 +551,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\sound\midiplugin.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\sound\mixer.cpp"
 				>
 			</File>
diff --git a/dists/msvc8_to_msvc7_71.bat b/dists/msvc8_to_msvc7_71.bat
index 11be21e1dd..71d04f68a3 100644
--- a/dists/msvc8_to_msvc7_71.bat
+++ b/dists/msvc8_to_msvc7_71.bat
@@ -101,3 +101,4 @@ echo Place rpl.exe from the bin folder inside the archive in the folder where
 echo this batch file resides
 
 :the_end
+pause
diff --git a/dists/msvc9/gob.vcproj b/dists/msvc9/gob.vcproj
index cb17c9f9d1..60cb8ddbc3 100644
--- a/dists/msvc9/gob.vcproj
+++ b/dists/msvc9/gob.vcproj
@@ -466,6 +466,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\saveload_v4.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\scenery.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/kyra.vcproj b/dists/msvc9/kyra.vcproj
index b004e9463e..f56a2733b5 100644
--- a/dists/msvc9/kyra.vcproj
+++ b/dists/msvc9/kyra.vcproj
@@ -166,15 +166,15 @@
 			>
 		</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
@@ -210,19 +210,19 @@
 			>
 		</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
@@ -238,11 +238,11 @@
 			>
 		</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
@@ -250,19 +250,19 @@
 			>
 		</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
@@ -306,19 +306,19 @@
 			>
 		</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
@@ -350,19 +350,19 @@
 			>
 		</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
@@ -386,6 +386,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\kyra\script_lok.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\kyra\script_mr.cpp"
 			>
 		</File>
@@ -418,11 +422,11 @@
 			>
 		</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
@@ -446,11 +450,11 @@
 			>
 		</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
@@ -482,15 +486,15 @@
 			>
 		</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
@@ -506,11 +510,11 @@
 			>
 		</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
diff --git a/dists/msvc9/made.vcproj b/dists/msvc9/made.vcproj
index 17b619911f..a96ae262cb 100644
--- a/dists/msvc9/made.vcproj
+++ b/dists/msvc9/made.vcproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9,00"
@@ -230,27 +230,27 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.cpp"
+			RelativePath="..\..\engines\made\screenfx.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\script.h"
+			RelativePath="..\..\engines\made\screenfx.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs.h"
+			RelativePath="..\..\engines\made\script.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_lgop2.cpp"
+			RelativePath="..\..\engines\made\script.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_mhne.cpp"
+			RelativePath="..\..\engines\made\scriptfuncs.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\made\scriptfuncs_rtz.cpp"
+			RelativePath="..\..\engines\made\scriptfuncs.h"
 			>
 		</File>
 		<File
diff --git a/dists/msvc9/parallaction.vcproj b/dists/msvc9/parallaction.vcproj
index 5eebf23e7e..bdc93860f9 100644
--- a/dists/msvc9/parallaction.vcproj
+++ b/dists/msvc9/parallaction.vcproj
@@ -230,6 +230,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\parallaction\input.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\parallaction\input.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\parallaction\inventory.cpp"
 			>
 		</File>
diff --git a/dists/msvc9/scummvm.vcproj b/dists/msvc9/scummvm.vcproj
index afeafc3dd3..0de6bdc616 100644
--- a/dists/msvc9/scummvm.vcproj
+++ b/dists/msvc9/scummvm.vcproj
@@ -556,6 +556,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\sound\midiplugin.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\sound\mixer.cpp"
 				>
 			</File>