From d3ca060ac6379d310f35395680faba40f2fa6e79 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Fri, 30 Oct 2009 20:28:55 -0700
Subject: msvc: fix compile errors

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 crawl-ref/source/MSVC/crawl.vcproj | 1878 +++++++++++++++++++-----------------
 1 file changed, 993 insertions(+), 885 deletions(-)

(limited to 'crawl-ref/source/MSVC')

diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index 009f95b82a..a4f46ef72e 100644
--- a/crawl-ref/source/MSVC/crawl.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -11,19 +11,19 @@
 		<Platform
 			Name="Win32"
 		/>
-		<Platform
-			Name="x64"
-		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
 	<Configurations>
-		<Configuration
-			Name="Debug Console|Win32"
-			OutputDirectory="$(SolutionDir)\.."
-			ConfigurationType="1"
-			InheritedPropertySheets=".\Console.vsprops;.\Debug.vsprops;.\Common.vsprops"
-			CharacterSet="0"
+		<Configuration
+			Name="Debug Console|Win32"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Console.vsprops;.\Debug.vsprops;.\Common.vsprops"
+			CharacterSet="0"
 			WholeProgramOptimization="0"
 			>
 			<Tool
@@ -67,7 +67,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -97,11 +97,91 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug Console|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Console.vsprops;.\Debug.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release Console|Win32"
 			OutputDirectory="$(SolutionDir)\.."
 			ConfigurationType="1"
-			InheritedPropertySheets=".\Console.vsprops;.\Release.vsprops;.\Common.vsprops"
+			InheritedPropertySheets=".\Console.vsprops;.\Release.vsprops;.\Common.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="0"
 			>
@@ -143,7 +223,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
@@ -175,11 +255,90 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Release Console|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Console.vsprops;.\Release.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Debug Tiles|Win32"
 			OutputDirectory="$(SolutionDir)\.."
 			ConfigurationType="1"
-			InheritedPropertySheets=".\Tiles.vsprops;.\Debug.vsprops;.\Common.vsprops"
+			InheritedPropertySheets=".\Tiles.vsprops;.\Debug.vsprops;.\Common.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="0"
 			>
@@ -202,7 +361,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				UsePrecompiledHeader="2"
@@ -222,13 +381,94 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug Tiles|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Tiles.vsprops;.\Debug.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -259,16 +499,16 @@
 			Name="Release Tiles|Win32"
 			OutputDirectory="$(SolutionDir)\.."
 			ConfigurationType="1"
-			InheritedPropertySheets=".\Tiles.vsprops;.\Release.vsprops;.\Common.vsprops"
+			InheritedPropertySheets=".\Tiles.vsprops;.\Release.vsprops;.\Common.vsprops"
 			CharacterSet="0"
 			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd $(ProjectDir)\..&#x0D;&#x0A;perl util/gen-cflg.pl compflag.h &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot;&#x0D;&#x0A;perl util/gen_ver.pl build.h&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd $(ProjectDir)\..&#x0D;&#x0A;perl util/gen-cflg.pl compflag.h &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot;&#x0D;&#x0A;perl util/gen_ver.pl build.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -282,7 +522,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="AppHdr.h"
 				WarningLevel="3"
@@ -300,13 +540,13 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				TargetMachine="1"
 			/>
@@ -335,327 +575,87 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug Console|x64"
-			OutputDirectory="$(SolutionDir)\.."
-			ConfigurationType="1"
-			InheritedPropertySheets=".\Console.vsprops;.\Debug.vsprops;.\Common.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="AppHdr.h"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Console|x64"
-			OutputDirectory="$(SolutionDir)\.."
-			ConfigurationType="1"
-			InheritedPropertySheets=".\Console.vsprops;.\Release.vsprops;.\Common.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="AppHdr.h"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug Tiles|x64"
-			OutputDirectory="$(SolutionDir)\.."
-			ConfigurationType="1"
-			InheritedPropertySheets=".\Tiles.vsprops;.\Debug.vsprops;.\Common.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="AppHdr.h"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release Tiles|x64"
-			OutputDirectory="$(SolutionDir)\.."
-			ConfigurationType="1"
-			InheritedPropertySheets=".\Tiles.vsprops;.\Release.vsprops;.\Common.vsprops"
-			CharacterSet="0"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="cd $(ProjectDir)\..&#x0D;&#x0A;perl util/gen-cflg.pl compflag.h &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot;&#x0D;&#x0A;perl util/gen_ver.pl build.h&#x0D;&#x0A;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="AppHdr.h"
-				WarningLevel="3"
-				WarnAsError="false"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
+		<Configuration
+			Name="Release Tiles|x64"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Tiles.vsprops;.\Release.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd $(ProjectDir)\..&#x0D;&#x0A;perl util/gen-cflg.pl compflag.h &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot; &quot;&lt;unavailable&gt;&quot;&#x0D;&#x0A;perl util/gen_ver.pl build.h&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="AppHdr.h"
+				WarningLevel="3"
+				WarnAsError="false"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="SDL.lib SDL_image.lib libpng.lib lua.lib pcre.lib sqlite.lib zlib.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
@@ -681,18 +681,42 @@
 			>
 		</File>
 		<File
-			RelativePath="..\actor.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\actor.h"
-			>
-		</File>
-		<File
+			RelativePath="..\actor.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\actor.h"
+			>
+		</File>
+		<File
 			RelativePath="..\AppHdr.cc"
 			>
 			<FileConfiguration
-				Name="Debug Console|Win32"
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -700,7 +724,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release Console|Win32"
+				Name="Debug Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -708,7 +732,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug Tiles|Win32"
+				Name="Debug Tiles|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -723,38 +747,14 @@
 					UsePrecompiledHeader="1"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\AppHdr.h"
@@ -768,6 +768,14 @@
 			RelativePath="..\arena.h"
 			>
 		</File>
+		<File
+			RelativePath="..\art-data.h"
+			>
+		</File>
+		<File
+			RelativePath="..\art-func.h"
+			>
+		</File>
 		<File
 			RelativePath="..\artefact.cc"
 			>
@@ -800,6 +808,10 @@
 			RelativePath="..\branch.h"
 			>
 		</File>
+		<File
+			RelativePath="..\build.h"
+			>
+		</File>
 		<File
 			RelativePath="..\chardump.cc"
 			>
@@ -833,14 +845,30 @@
 			>
 		</File>
 		<File
-			RelativePath="..\cluautil.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\cluautil.h"
-			>
-		</File>
-		<File
+			RelativePath="..\cluautil.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\cluautil.h"
+			>
+		</File>
+		<File
+			RelativePath="..\cmd-keys.h"
+			>
+		</File>
+		<File
+			RelativePath="..\cmd-name.h"
+			>
+		</File>
+		<File
+			RelativePath="..\colour.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\colour.h"
+			>
+		</File>
+		<File
 			RelativePath="..\command.cc"
 			>
 		</File>
@@ -848,10 +876,42 @@
 			RelativePath="..\command.h"
 			>
 		</File>
+		<File
+			RelativePath="..\compflag.h"
+			>
+		</File>
+		<File
+			RelativePath="..\coord.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\coord.h"
+			>
+		</File>
+		<File
+			RelativePath="..\coordit.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\coordit.h"
+			>
+		</File>
 		<File
 			RelativePath="..\crash-w.cc"
 			>
 		</File>
+		<File
+			RelativePath="..\crash.h"
+			>
+		</File>
+		<File
+			RelativePath="..\ctest.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\ctest.h"
+			>
+		</File>
 		<File
 			RelativePath="..\database.cc"
 			>
@@ -863,6 +923,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -871,6 +939,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -879,6 +955,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -887,38 +971,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\database.h"
@@ -977,14 +1037,14 @@
 			>
 		</File>
 		<File
-			RelativePath="..\dlua.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\dlua.h"
-			>
-		</File>
-		<File
+			RelativePath="..\dlua.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\dlua.h"
+			>
+		</File>
+		<File
 			RelativePath="..\dungeon.cc"
 			>
 		</File>
@@ -1004,6 +1064,14 @@
 			RelativePath="..\enum.h"
 			>
 		</File>
+		<File
+			RelativePath="..\exclude.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\exclude.h"
+			>
+		</File>
 		<File
 			RelativePath="..\externs.h"
 			>
@@ -1057,22 +1125,22 @@
 			>
 		</File>
 		<File
-			RelativePath="..\godabil.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\godabil.h"
-			>
-		</File>
-		<File
-			RelativePath="..\goditem.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\goditem.h"
-			>
-		</File>
-		<File
+			RelativePath="..\godabil.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\godabil.h"
+			>
+		</File>
+		<File
+			RelativePath="..\goditem.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\goditem.h"
+			>
+		</File>
+		<File
 			RelativePath="..\hiscores.cc"
 			>
 		</File>
@@ -1145,14 +1213,14 @@
 			>
 		</File>
 		<File
-			RelativePath="..\jobs.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\jobs.h"
-			>
-		</File>
-		<File
+			RelativePath="..\jobs.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\jobs.h"
+			>
+		</File>
+		<File
 			RelativePath="..\kills.cc"
 			>
 		</File>
@@ -1161,74 +1229,74 @@
 			>
 		</File>
 		<File
-			RelativePath="..\l_crawl.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_debug.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_defs.h"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgn.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgn_bf.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgnbld.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgnevt.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgngrd.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgnit.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgnlvl.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgnmon.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_dgntil.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_file.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_food.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_global.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_item.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_libs.h"
-			>
-		</File>
-		<File
+			RelativePath="..\l_crawl.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_debug.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_defs.h"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgn.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgn_bf.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgnbld.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgnevt.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgngrd.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgnit.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgnlvl.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgnmon.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_dgntil.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_file.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_food.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_global.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_item.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_libs.h"
+			>
+		</File>
+		<File
 			RelativePath="..\l_los.cc"
 			>
 		</File>
@@ -1237,26 +1305,34 @@
 			>
 		</File>
 		<File
-			RelativePath="..\l_mapgrd.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_mapmrk.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_mons.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_option.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\l_you.cc"
-			>
-		</File>
-		<File
+			RelativePath="..\l_mapgrd.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_mapmrk.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_moninf.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_mons.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_option.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_view.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\l_you.cc"
+			>
+		</File>
+		<File
 			RelativePath="..\lev-pand.cc"
 			>
 		</File>
@@ -1265,7 +1341,75 @@
 			>
 		</File>
 		<File
-			RelativePath="..\prebuilt\levcomp.lex.cc"
+			RelativePath="..\prebuilt\levcomp.lex.cc"
+			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\prebuilt\levcomp.tab.cc"
 			>
 			<FileConfiguration
 				Name="Debug Console|Win32"
@@ -1276,7 +1420,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release Console|Win32"
+				Name="Debug Console|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1284,7 +1428,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug Tiles|Win32"
+				Name="Release Console|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1292,51 +1436,15 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release Tiles|Win32"
+				Name="Release Console|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\prebuilt\levcomp.tab.cc"
-			>
 			<FileConfiguration
-				Name="Debug Console|Win32"
+				Name="Debug Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1344,7 +1452,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release Console|Win32"
+				Name="Debug Tiles|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1352,7 +1460,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug Tiles|Win32"
+				Name="Release Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1360,45 +1468,13 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release Tiles|Win32"
+				Name="Release Tiles|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\prebuilt\levcomp.tab.h"
@@ -1431,6 +1507,14 @@
 					UsePrecompiledHeader="2"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -1439,6 +1523,14 @@
 					UsePrecompiledHeader="2"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -1447,6 +1539,14 @@
 					UsePrecompiledHeader="2"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -1455,38 +1555,14 @@
 					UsePrecompiledHeader="2"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="2"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="2"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\libw32c.h"
@@ -1584,6 +1660,14 @@
 			RelativePath="..\mon-data.h"
 			>
 		</File>
+		<File
+			RelativePath="..\mon-info.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\mon-info.h"
+			>
+		</File>
 		<File
 			RelativePath="..\mon-pick.cc"
 			>
@@ -1655,6 +1739,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -1663,6 +1755,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -1671,6 +1771,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -1679,38 +1787,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\mt19937ar.h"
@@ -1741,22 +1825,30 @@
 			>
 		</File>
 		<File
-			RelativePath="..\ng-input.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\ng-input.h"
-			>
-		</File>
-		<File
-			RelativePath="..\ng-restr.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\ng-restr.h"
-			>
-		</File>
-		<File
+			RelativePath="..\ng-init.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\ng-init.h"
+			>
+		</File>
+		<File
+			RelativePath="..\ng-input.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\ng-input.h"
+			>
+		</File>
+		<File
+			RelativePath="..\ng-restr.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\ng-restr.h"
+			>
+		</File>
+		<File
 			RelativePath="..\notes.cc"
 			>
 		</File>
@@ -1812,6 +1904,14 @@
 			RelativePath="..\quiver.h"
 			>
 		</File>
+		<File
+			RelativePath="..\random.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\random.h"
+			>
+		</File>
 		<File
 			RelativePath="..\ray.cc"
 			>
@@ -1828,6 +1928,14 @@
 			RelativePath="..\religion.h"
 			>
 		</File>
+		<File
+			RelativePath="..\rng.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\rng.h"
+			>
+		</File>
 		<File
 			RelativePath="..\shopping.cc"
 			>
@@ -1853,14 +1961,14 @@
 			>
 		</File>
 		<File
-			RelativePath="..\species.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\species.h"
-			>
-		</File>
-		<File
+			RelativePath="..\species.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\species.h"
+			>
+		</File>
+		<File
 			RelativePath="..\spells1.cc"
 			>
 		</File>
@@ -2007,6 +2115,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -2015,6 +2131,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -2023,6 +2147,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -2031,38 +2163,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\rltiles\tiledef-dngn.h"
@@ -2079,6 +2187,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -2087,6 +2203,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -2095,6 +2219,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -2103,38 +2235,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\rltiles\tiledef-gui.h"
@@ -2151,6 +2259,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -2159,6 +2275,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -2167,6 +2291,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -2175,38 +2307,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\rltiles\tiledef-main.h"
@@ -2223,6 +2331,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -2231,6 +2347,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -2239,6 +2363,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -2247,38 +2379,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\rltiles\tiledef-player.h"
@@ -2295,6 +2403,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Console|Win32"
 				>
@@ -2303,6 +2419,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Debug Tiles|Win32"
 				>
@@ -2311,6 +2435,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
 				Name="Release Tiles|Win32"
 				>
@@ -2319,38 +2451,14 @@
 					UsePrecompiledHeader="0"
 				/>
 			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Console|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release Tiles|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|x64"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
 			RelativePath="..\rltiles\tiledef-unrand.h"
-- 
cgit v1.2.3-54-g00ecf