*Full revert, rev 196.

PseuWoW_VC80.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PseuWoW_VC80", "src\PseuWoW_VC80.vcproj", "{EFFE60F4-DA39-41E8-9E53-E462000A2D91}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PseuWoW", "src\PseuWoW_VC80.vcproj", "{EFFE60F4-DA39-41E8-9E53-E462000A2D91}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E08E042A-6C45-411B-92BE-3CC31331019F} = {E08E042A-6C45-411B-92BE-3CC31331019F}
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
@@ -10,30 +10,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PseuWoW_VC80", "src\PseuWoW
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "src\zlib_VC80.vcproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zthread", "src\zthread.vcproj_VC80", "{262199E8-EEDF-4700-A1D1-E9CC901CF480}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zthread", "src\zthread_VC80.vcproj", "{262199E8-EEDF-4700-A1D1-E9CC901CF480}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "src\shared.vcproj_VC80", "{F548FC51-24A4-45FF-A381-BEBC39F18270}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "src\shared_VC80.vcproj", "{F548FC51-24A4-45FF-A381-BEBC39F18270}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480} = {262199E8-EEDF-4700-A1D1-E9CC901CF480}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Irrlicht", "src\dep\src\irrlicht\Irrlicht8.0.vcproj", "{E08E042A-6C45-411B-92BE-3CC31331019F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StuffExtract", "src\tools\stuffextract_VC80.vcproj", "{1FECF210-93BE-4F1F-9809-3F0010D9CC22}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StuffExtract", "src\tools\stuffextract_VC80.vcproj", "{FBBE6172-CCDE-4ADD-94A6-55C91D700DB6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}
 		{F548FC51-24A4-45FF-A381-BEBC39F18270} = {F548FC51-24A4-45FF-A381-BEBC39F18270}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Irrlicht", "src\dep\src\irrlicht\Irrlicht8.0.vcproj", "{E08E042A-6C45-411B-92BE-3CC31331019F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Relase - Fast FPU|Win32 = Relase - Fast FPU|Win32
 		Release - Fast FPU DebugInfo|Win32 = Release - Fast FPU DebugInfo|Win32
+		Release - Fast FPU|Win32 = Release - Fast FPU|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -43,6 +41,8 @@ Global
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Relase - Fast FPU|Win32.Build.0 = Release|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release - Fast FPU|Win32.Build.0 = Release|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release|Win32.ActiveCfg = Release|Win32
 		{EFFE60F4-DA39-41E8-9E53-E462000A2D91}.Release|Win32.Build.0 = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -51,6 +51,8 @@ Global
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Relase - Fast FPU|Win32.Build.0 = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release - Fast FPU|Win32.Build.0 = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32
 		{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -59,6 +61,8 @@ Global
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Relase - Fast FPU|Win32.Build.0 = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release - Fast FPU|Win32.Build.0 = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release|Win32.ActiveCfg = Release|Win32
 		{262199E8-EEDF-4700-A1D1-E9CC901CF480}.Release|Win32.Build.0 = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -67,20 +71,30 @@ Global
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Relase - Fast FPU|Win32.Build.0 = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release - Fast FPU|Win32.Build.0 = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release|Win32.ActiveCfg = Release|Win32
 		{F548FC51-24A4-45FF-A381-BEBC39F18270}.Release|Win32.Build.0 = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Debug|Win32.Build.0 = Debug|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Relase - Fast FPU|Win32.Build.0 = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Release - Fast FPU|Win32.Build.0 = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Release|Win32.ActiveCfg = Release|Win32
+		{1FECF210-93BE-4F1F-9809-3F0010D9CC22}.Release|Win32.Build.0 = Release|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Debug|Win32.Build.0 = Debug|Win32
-		{E08E042A-6C45-411B-92BE-3CC31331019F}.Relase - Fast FPU|Win32.ActiveCfg = Relase - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
-		{E08E042A-6C45-411B-92BE-3CC31331019F}.Relase - Fast FPU|Win32.Build.0 = Relase - Fast FPU|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Relase - Fast FPU|Win32.Build.0 = Release|Win32
-		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release - Fast FPU DebugInfo|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
-		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release - Fast FPU DebugInfo|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU DebugInfo|Win32.Build.0 = Release|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU|Win32.ActiveCfg = Release|Win32
+		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release - Fast FPU|Win32.Build.0 = Release|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release|Win32.ActiveCfg = Release|Win32
 		{E08E042A-6C45-411B-92BE-3CC31331019F}.Release|Win32.Build.0 = Release|Win32
-		{FBBE6172-CCDE-4ADD-94A6-55C91D700DB6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FBBE6172-CCDE-4ADD-94A6-55C91D700DB6}.Relase - Fast FPU|Win32.ActiveCfg = Release|Win32
-		{FBBE6172-CCDE-4ADD-94A6-55C91D700DB6}.Release - Fast FPU DebugInfo|Win32.ActiveCfg = Release|Win32
-		{FBBE6172-CCDE-4ADD-94A6-55C91D700DB6}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/PseuWoW_VC80.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="PseuWoW"
 	ProjectGUID="{EFFE60F4-DA39-41E8-9E53-E462000A2D91}"
 	RootNamespace="PseuWoW"
@@ -174,7 +174,7 @@
 				OutputFile="$(OutDir)/$(InputName)_debug.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories="$(SolutionDir)\src\dep\lib"
 				IgnoreDefaultLibraryNames="libci.lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(SolutionDir)/temp/$(ProjectName)/PseuWoW.pdb"
@@ -243,6 +243,14 @@
 				RelativePath=".\Client\HelperDefs.h"
 				>
 			</File>
+			<File
+				RelativePath=".\Client\log.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Client\log.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Client\main.cpp"
 				>
@@ -297,10 +305,6 @@
 						/>
 					</FileConfiguration>
 				</File>
-				<File
-					RelativePath=".\Client\DefScript\DefScriptBBFunctions.cpp"
-					>
-				</File>
 				<File
 					RelativePath=".\Client\DefScript\DefScriptDefines.h"
 					>
@@ -330,7 +334,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\Client\DefScript\TypeStorage.h"
+					RelativePath=".\Client\DefScript\ListStorage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Client\DefScript\ListStorage.h"
 					>
 				</File>
 				<File
@@ -553,14 +561,6 @@
 					RelativePath=".\Client\Gui\DrawObjMgr.h"
 					>
 				</File>
-				<File
-					RelativePath=".\Client\Gui\MCamera.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Client\Gui\MInput.h"
-					>
-				</File>
 				<File
 					RelativePath=".\Client\Gui\PseuGUI.cpp"
 					>
@@ -569,34 +569,6 @@
 					RelativePath=".\Client\Gui\PseuGUI.h"
 					>
 				</File>
-				<File
-					RelativePath=".\Client\Gui\Scene.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Client\Gui\Scene.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Client\Gui\SceneGuiStart.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Client\Gui\SceneWorld.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Client\Gui\ShTlTerrainSceneNode.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Client\Gui\ShTlTerrainSceneNode.h"
-					>
-				</File>
-				<File
-					RelativePath=".\Client\Gui\TlTMesh.h"
-					>
-				</File>
 			</Filter>
 		</Filter>
 		<Filter

src/dep/src/irrlicht/Irrlicht8.0.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="Irrlicht"
 	ProjectGUID="{E08E042A-6C45-411B-92BE-3CC31331019F}"
 	RootNamespace="Irrlicht"
@@ -16,13 +16,13 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			OutputDirectory="..\obj\IrrDebug"
-			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="..\obj\IrrDebug"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
+			CharacterSet="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -47,14 +47,14 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)\src\dep\include\zlib;$(SolutionDir)\src\dep\include\irrlicht;$(SolutionDir)\src\dep\include\DXSDK\include"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src\dep\include\zlib&quot;;&quot;$(SolutionDir)\src\dep\include\irrlicht&quot;;&quot;$(SolutionDir)\src\dep\include\DXSDK\include&quot;"
-				PreprocessorDefinitions="WIN32"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\..\obj\IrrDebug/Irrlicht.pch"
-				AssemblerListingLocation="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				AssemblerListingLocation=".\..\obj\IrrDebug/"
-				ObjectFile="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				ObjectFile=".\..\obj\IrrDebug/"
-				ProgramDataBaseFileName="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\..\obj\IrrDebug/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
@@ -75,8 +75,7 @@
 				Name="VCLibrarianTool"
 				AdditionalDependencies="d3dx8.lib"
 				OutputFile="$(SolutionDir)/src/dep/lib/debug/irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)/src/dep/lib/static"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)/src/dep/lib/static&quot;"
-				IgnoreDefaultLibraryNames="libci.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -96,8 +95,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			OutputDirectory="obj\IrrRelease"
-			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="obj\IrrRelease"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -130,22 +129,21 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="false"
-				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src\dep\include\zlib&quot;;&quot;$(SolutionDir)\src\dep\include\irrlicht&quot;;&quot;$(SolutionDir)\src\dep\include\DXSDK\include&quot;"
-				OmitFramePointers="true"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				AdditionalIncludeDirectories="$(SolutionDir)\src\dep\include\zlib;$(SolutionDir)\src\dep\include\irrlicht;$(SolutionDir)\src\dep\include\DXSDK\include"
-				PreprocessorDefinitions="WIN32"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
 				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
+				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
+				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
-				AssemblerListingLocation="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
-				ObjectFile="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				ObjectFile=".\..\obj\IrrRelease/"
-				ProgramDataBaseFileName="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -162,8 +160,7 @@
 				Name="VCLibrarianTool"
 				AdditionalDependencies="d3dx8.lib"
 				OutputFile="$(SolutionDir)/src/dep/lib/release/irrlicht.lib"
-				AdditionalLibraryDirectories="$(SolutionDir)/src/dep/lib/static"
+				AdditionalLibraryDirectories="&quot;$(SolutionDir)/src/dep/lib/static&quot;"
-				IgnoreDefaultLibraryNames="libci.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -182,9 +179,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Relase - Fast FPU|Win32"
+			Name="Release - Fast FPU|Win32"
-			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
@@ -214,27 +211,29 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/QIfist /Oa&#x0D;&#x0A;"
 				Optimization="3"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
+				FavorSizeOrSpeed="0"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="$(SolutionDir)\src\dep\include\zlib;$(SolutionDir)\src\dep\include\irrlicht;$(SolutionDir)\src\dep\include\DXSDK\include"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\src\dep\include\zlib&quot;;&quot;$(SolutionDir)\src\dep\include\irrlicht&quot;;&quot;$(SolutionDir)\src\dep\include\DXSDK\include&quot;"
-				PreprocessorDefinitions="WIN32"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;IRRLICHT_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="0"
 				RuntimeLibrary="0"
-				StructMemberAlignment="0"
 				BufferSecurityCheck="false"
-				TreatWChar_tAsBuiltInType="true"
+				EnableFunctionLevelLinking="true"
-				AssemblerListingLocation="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				FloatingPointModel="2"
-				ObjectFile="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				RuntimeTypeInfo="false"
-				ProgramDataBaseFileName="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
+				PrecompiledHeaderFile=".\..\obj\IrrRelease/Irrlicht.pch"
+				AssemblerListingLocation=".\..\obj\IrrRelease/"
+				ObjectFile=".\..\obj\IrrRelease/"
+				ProgramDataBaseFileName=".\..\obj\IrrRelease/"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				DebugInformationFormat="0"
 				CallingConvention="1"
+				CompileAs="0"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -250,96 +249,8 @@
 			<Tool
 				Name="VCLibrarianTool"
 				AdditionalDependencies="d3dx8.lib"
-				IgnoreDefaultLibraryNames="libci.lib"
+				OutputFile="$(SolutionDir)/src/dep/lib/dd/irrlicht.lib"
-			/>
+				AdditionalLibraryDirectories="$(SolutionDir)/src/dep/lib/static"
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release - Fast FPU DebugInfo|Win32"
-			OutputDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\Release/Irrlicht.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/QIfist"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="$(SolutionDir)\src\dep\include\zlib;$(SolutionDir)\src\dep\include\irrlicht;$(SolutionDir)\src\dep\include\DXSDK\include"
-				PreprocessorDefinitions="WIN32"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				StructMemberAlignment="3"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				EnableEnhancedInstructionSet="0"
-				TreatWChar_tAsBuiltInType="true"
-				AssemblerListingLocation="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
-				ObjectFile="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
-				ProgramDataBaseFileName="$(SolutionDir)/temp/$(ProjectName)/$(ConfigurationName)/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CallingConvention="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="3079"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				AdditionalDependencies="d3dx8.lib"
-				IgnoreDefaultLibraryNames="libci.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -483,18 +394,10 @@
 					RelativePath=".\..\..\include\aabbox3d.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\include\coreutil.h"
-					>
-				</File>
 				<File
 					RelativePath=".\..\..\include\dimension2d.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\include\fast_atof.h"
-					>
-				</File>
 				<File
 					RelativePath=".\..\..\include\heapsort.h"
 					>
@@ -623,10 +526,6 @@
 					RelativePath=".\..\..\include\IAnimatedMeshMD2.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\include\IAnimatedMeshMD3.h"
-					>
-				</File>
 				<File
 					RelativePath=".\..\..\include\IAnimatedMeshMS3D.h"
 					>
@@ -699,10 +598,6 @@
 					RelativePath=".\..\..\include\IQ3LevelMesh.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\include\IQ3Shader.h"
-					>
-				</File>
 				<File
 					RelativePath=".\..\..\include\ISceneCollisionManager.h"
 					>
@@ -803,10 +698,6 @@
 					RelativePath=".\..\..\include\IGUICheckbox.h"
 					>
 				</File>
-				<File
-					RelativePath="..\..\include\IGUIColorSelectDialog.h"
-					>
-				</File>
 				<File
 					RelativePath=".\..\..\include\IGUIComboBox.h"
 					>
@@ -823,6 +714,10 @@
 					RelativePath=".\..\..\include\IGUIElement.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\include\IGUIElementFactory.h"
+					>
+				</File>
 				<File
 					RelativePath=".\..\..\include\IGUIEnvironment.h"
 					>
@@ -916,10 +811,6 @@
 				RelativePath=".\CGUIColorSelectDialog.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\CGUIColorSelectDialog.h"
-				>
-			</File>
 			<File
 				RelativePath="CGUIComboBox.cpp"
 				>
@@ -973,7 +864,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\CGUIImage.H"
+				RelativePath=".\CGUIImage.h"
 				>
 			</File>
 			<File
@@ -1080,10 +971,6 @@
 				RelativePath=".\CGUIWindow.h"
 				>
 			</File>
-			<File
-				RelativePath=".\GUIIcons.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="video impl"
@@ -1315,6 +1202,54 @@
 					RelativePath="CImage.h"
 					>
 				</File>
+				<File
+					RelativePath="CImageLoaderBMP.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderBMP.h"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderJPG.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderJPG.h"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderPCX.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderPCX.h"
+					>
+				</File>
+				<File
+					RelativePath=".\CImageLoaderPNG.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CImageLoaderPNG.h"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderPSD.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderPSD.h"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderTGA.cpp"
+					>
+				</File>
+				<File
+					RelativePath="CImageLoaderTGA.h"
+					>
+				</File>
 				<File
 					RelativePath=".\CNullDriver.cpp"
 					>
@@ -1387,58 +1322,6 @@
 						>
 					</File>
 				</Filter>
-				<Filter
-					Name="Loader"
-					>
-					<File
-						RelativePath="CImageLoaderBMP.cpp"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderBMP.h"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderJPG.cpp"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderJPG.h"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderPCX.cpp"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderPCX.h"
-						>
-					</File>
-					<File
-						RelativePath=".\CImageLoaderPNG.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\CImageLoaderPNG.h"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderPSD.cpp"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderPSD.h"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderTGA.cpp"
-						>
-					</File>
-					<File
-						RelativePath="CImageLoaderTGA.h"
-						>
-					</File>
-				</Filter>
 			</Filter>
 			<Filter
 				Name="Direct3D9"
@@ -2101,7 +1984,7 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="sceneNodes animators"
+				Name="animators"
 				>
 				<File
 					RelativePath="CSceneNodeAnimatorCollisionResponse.cpp"
@@ -2160,110 +2043,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="io impl"
-				>
-				<File
-					RelativePath=".\CAttributeImpl.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CAttributes.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CAttributes.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CFileList.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CFileList.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CFileSystem.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CFileSystem.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CLimitReadFile.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CLimitReadFile.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CMemoryReadFile.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CMemoryReadFile.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CPakReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CPakReader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CReadFile.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CReadFile.h"
-					>
-				</File>
-				<File
-					RelativePath="CWriteFile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="CWriteFile.h"
-					>
-				</File>
-				<File
-					RelativePath="CXMLReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath="CXMLReader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CXMLReaderImpl.h"
-					>
-				</File>
-				<File
-					RelativePath="CXMLWriter.cpp"
-					>
-				</File>
-				<File
-					RelativePath="CXMLWriter.h"
-					>
-				</File>
-				<File
-					RelativePath=".\CZipReader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\CZipReader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\irrXML.cpp"
-					>
-				</File>
-			</Filter>
 		</Filter>
 		<Filter
 			Name="io impl"

src/shared_VC80.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="shared"
 	ProjectGUID="{F548FC51-24A4-45FF-A381-BEBC39F18270}"
 	RootNamespace="PseuWoW_Controller"
@@ -189,14 +189,6 @@
 				RelativePath=".\shared\DebugStuff.h"
 				>
 			</File>
-			<File
-				RelativePath=".\shared\log.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\shared\log.h"
-				>
-			</File>
 			<File
 				RelativePath=".\shared\SysDefs.h"
 				>
@@ -409,12 +401,10 @@
 					>
 				</File>
 				<File
-					RelativePath=".\shared\Auth\MD5Hash.h"
+					RelativePath=".\shared\Auth\MD5Hash.h">
-					>
 				</File>
 				<File
-					RelativePath=".\shared\Auth\Sha1.cpp"
+					RelativePath=".\shared\Auth\Sha1.cpp">
-					>
 				</File>
 				<File
 					RelativePath=".\shared\Auth\Sha1.h"

src/tools/stuffextract_VC80.vcproj

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="StuffExtract"
-	ProjectGUID="{EFFE60F4-DA39-41E8-9E53-E462000A2D91}"
+	ProjectGUID="{1FECF210-93BE-4F1F-9809-3F0010D9CC22}"
 	RootNamespace="StuffExtract"
 	>
 	<Platforms>

src/zlib_VC80.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="zlib"
 	ProjectGUID="{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}"
 	RootNamespace="zlib"

src/zthread_VC80.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="zthread"
 	ProjectGUID="{262199E8-EEDF-4700-A1D1-E9CC901CF480}"
 	>