Applied the patch by thebluegr (bug #1700986)

svn-id: r26504

5 files changed, 35 insertions, 39 deletions

diff --git a/dists/msvc8/agi.vcproj b/dists/msvc8/agi.vcproj
index 4f9ea61c3c..c858028554 100644
--- a/dists/msvc8/agi.vcproj
+++ b/dists/msvc8/agi.vcproj
@@ -277,10 +277,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\agi\patches.cpp"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\agi\picture.cpp"
 			>
 		</File>
diff --git a/dists/msvc8/gob.vcproj b/dists/msvc8/gob.vcproj
index 09646cd753..8770210a79 100644
--- a/dists/msvc8/gob.vcproj
+++ b/dists/msvc8/gob.vcproj
@@ -123,7 +123,7 @@
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="true"
+				WarnAsError="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -160,14 +160,6 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\..\engines\gob\anim.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\anim.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\cdrom.cpp"
 			>
 		</File>
@@ -264,6 +256,18 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\goblin_v3.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\imd.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\imd.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\init.cpp"
 			>
 		</File>
@@ -300,6 +304,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\engines\gob\inter_v3.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\engines\gob\map.cpp"
 			>
 		</File>
@@ -340,14 +348,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\pack.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\gob\pack.h"
-			>
-		</File>
-		<File
 			RelativePath="..\..\engines\gob\palanim.cpp"
 			>
 		</File>
@@ -372,35 +372,43 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery.cpp"
+			RelativePath="..\..\engines\gob\saveload.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery.h"
+			RelativePath="..\..\engines\gob\saveload.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery_v1.cpp"
+			RelativePath="..\..\engines\gob\saveload_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\scenery_v2.cpp"
+			RelativePath="..\..\engines\gob\saveload_v3.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\sound.cpp"
+			RelativePath="..\..\engines\gob\scenery.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\sound.h"
+			RelativePath="..\..\engines\gob\scenery.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\timer.cpp"
+			RelativePath="..\..\engines\gob\scenery_v1.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\scenery_v2.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\engines\gob\timer.h"
+			RelativePath="..\..\engines\gob\sound.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\engines\gob\sound.h"
 			>
 		</File>
 		<File
diff --git a/dists/msvc8/lure.vcproj b/dists/msvc8/lure.vcproj
index 3668736547..90e2fc964f 100644
--- a/dists/msvc8/lure.vcproj
+++ b/dists/msvc8/lure.vcproj
@@ -330,14 +330,6 @@
 			RelativePath="..\..\engines\lure\surface.h"
 			>
 		</File>
-		<File
-			RelativePath="..\..\engines\lure\system.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\engines\lure\system.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/dists/msvc8/scumm.vcproj b/dists/msvc8/scumm.vcproj
index cec931fa29..adfa01be34 100644
--- a/dists/msvc8/scumm.vcproj
+++ b/dists/msvc8/scumm.vcproj
@@ -123,7 +123,7 @@
 				ForceConformanceInForLoopScope="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				WarnAsError="true"
+				WarnAsError="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj
index eace1d08a5..ae328d21d1 100644
--- a/dists/msvc8/scummvm.vcproj
+++ b/dists/msvc8/scummvm.vcproj
@@ -74,7 +74,7 @@
 				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/scummvm.pdb"
-				SubSystem="2"
+				SubSystem="1"
 				TargetMachine="1"
 			/>
 			<Tool