Merge branch 'master' of ssh://zelgadis@crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref

18 files changed, 50 insertions, 787 deletions

diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h
index 7864d87abe..5787f9aaf6 100644
--- a/crawl-ref/source/AppHdr.h
+++ b/crawl-ref/source/AppHdr.h
@@ -80,7 +80,9 @@
 // MinGW
 //
 #if defined(TARGET_COMPILER_MINGW)
+    #ifndef REGEX_PCRE
     #define REGEX_PCRE
+    #endif
 #endif
 
 // =========================================================================
@@ -208,7 +210,9 @@
 
     // Use Perl-compatible regular expressions. libpcre must be available and
     // linked in.  This is optional.
+    #ifndef REGEX_PCRE
     #define REGEX_PCRE
+    #endif
 #else
     #error Missing platform #define or unsupported compiler.
 #endif
@@ -518,6 +522,7 @@ inline void UNUSED(const volatile T &)
 
 #ifdef TARGET_COMPILER_VC
 #include "libw32c.h"
+#pragma warning (disable: 4290)
 #endif
 
 #endif
diff --git a/crawl-ref/source/MSVC/crawl-ref.sln b/crawl-ref/source/MSVC/crawl-ref.sln
index 9056563d63..6f36d961b8 100644
--- a/crawl-ref/source/MSVC/crawl-ref.sln
+++ b/crawl-ref/source/MSVC/crawl-ref.sln
@@ -9,11 +9,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crawl", "crawl.vcproj", "{3
 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125} = {A0FDC72E-0BE5-4542-B381-6A482DAC2125}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\contrib\lua\src\lua.vcproj", "{A61349B6-4099-4688-AA1A-00D91397857D}"
 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "..\contrib\sqlite\sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"
 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\contrib\pcre\pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilegen", "tilegen.vcproj", "{DAE92A45-087B-445B-8E94-BA864173A73F}"

 EndProject

@@ -21,72 +21,50 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug Console|Win32 = Debug Console|Win32

 		Debug Tiles|Win32 = Debug Tiles|Win32

-		Debug|Win32 = Debug|Win32

 		Release Console|Win32 = Release Console|Win32

 		Release Tiles|Win32 = Release Tiles|Win32

-		Release|Win32 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Console|Win32.ActiveCfg = Debug Console|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Console|Win32.Build.0 = Debug Console|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Tiles|Win32.ActiveCfg = Debug Tiles|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug Tiles|Win32.Build.0 = Debug Tiles|Win32

-		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug|Win32.ActiveCfg = Debug Tiles|Win32

-		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug|Win32.Build.0 = Debug Tiles|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Console|Win32.ActiveCfg = Release Console|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Console|Win32.Build.0 = Release Console|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|Win32.ActiveCfg = Release Tiles|Win32

 		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release Tiles|Win32.Build.0 = Release Tiles|Win32

-		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release|Win32.ActiveCfg = Release Tiles|Win32

-		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release|Win32.Build.0 = Release Tiles|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Console|Win32.ActiveCfg = Debug|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Console|Win32.Build.0 = Debug|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug Tiles|Win32.Build.0 = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Debug|Win32.Build.0 = Debug|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Console|Win32.ActiveCfg = Release|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Console|Win32.Build.0 = Release|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Tiles|Win32.ActiveCfg = Release|Win32

 		{A61349B6-4099-4688-AA1A-00D91397857D}.Release Tiles|Win32.Build.0 = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|Win32.ActiveCfg = Release|Win32

-		{A61349B6-4099-4688-AA1A-00D91397857D}.Release|Win32.Build.0 = Release|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Console|Win32.ActiveCfg = Debug|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Console|Win32.Build.0 = Debug|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug Tiles|Win32.Build.0 = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Debug|Win32.Build.0 = Debug|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Console|Win32.ActiveCfg = Release|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Console|Win32.Build.0 = Release|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Tiles|Win32.ActiveCfg = Release|Win32

 		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release Tiles|Win32.Build.0 = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|Win32.ActiveCfg = Release|Win32

-		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}.Release|Win32.Build.0 = Release|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Console|Win32.ActiveCfg = Debug|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Console|Win32.Build.0 = Debug|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug Tiles|Win32.Build.0 = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Debug|Win32.Build.0 = Debug|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Console|Win32.ActiveCfg = Release|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Console|Win32.Build.0 = Release|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Tiles|Win32.ActiveCfg = Release|Win32

 		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release Tiles|Win32.Build.0 = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|Win32.ActiveCfg = Release|Win32

-		{A0FDC72E-0BE5-4542-B381-6A482DAC2125}.Release|Win32.Build.0 = Release|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|Win32.ActiveCfg = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Console|Win32.Build.0 = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Tiles|Win32.ActiveCfg = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug Tiles|Win32.Build.0 = Debug|Win32

-		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug|Win32.ActiveCfg = Debug|Win32

-		{DAE92A45-087B-445B-8E94-BA864173A73F}.Debug|Win32.Build.0 = Debug|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Console|Win32.ActiveCfg = Release|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Console|Win32.Build.0 = Release|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Tiles|Win32.ActiveCfg = Release|Win32

 		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release Tiles|Win32.Build.0 = Release|Win32

-		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release|Win32.ActiveCfg = Release|Win32

-		{DAE92A45-087B-445B-8E94-BA864173A73F}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/crawl-ref/source/MSVC/crawl.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index fd2a1327e7..0cd46d23fa 100644
--- a/crawl-ref/source/MSVC/crawl.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -41,7 +41,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				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"

@@ -50,7 +50,7 @@
 				WarningLevel="3"

 				WarnAsError="false"

 				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -118,7 +118,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				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"

@@ -196,7 +196,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				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"

@@ -205,7 +205,7 @@
 				WarningLevel="3"

 				WarnAsError="false"

 				Detect64BitPortabilityProblems="false"

-				DebugInformationFormat="4"

+				DebugInformationFormat="3"

 			/>

 			<Tool

 				Name="VCManagedResourceCompilerTool"

@@ -273,7 +273,7 @@
 			/>

 			<Tool

 				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories=".;..;../contrib/lua/src;../contrib/sqlite;../contrib/pcre;../rltiles"
+				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"

@@ -718,6 +718,14 @@
 			>

 		</File>

 		<File

+			RelativePath="..\l_los.cc"

+			>

+		</File>

+		<File

+			RelativePath="..\l_los.h"

+			>

+		</File>

+		<File

 			RelativePath="..\lev-pand.cc"

 			>

 		</File>

diff --git a/crawl-ref/source/MSVC/lua.vcproj b/crawl-ref/source/MSVC/lua.vcproj
deleted file mode 100644
index 973087193f..0000000000
--- a/crawl-ref/source/MSVC/lua.vcproj
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8.00"

-	Name="lua"

-	ProjectGUID="{A61349B6-4099-4688-AA1A-00D91397857D}"

-	RootNamespace="lua"

-	Keyword="Win32Proj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			ConfigurationType="4"

-			InheritedPropertySheets=".\Common.vsprops;.\Debug.vsprops"
-			CharacterSet="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

-				MinimalRebuild="true"

-				BasicRuntimeChecks="3"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="4"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			ConfigurationType="4"

-			InheritedPropertySheets=".\Common.vsprops;.\Release.vsprops"
-			CharacterSet="1"

-			WholeProgramOptimization="1"

-			>

-			<Tool

-				Name="VCPreBuildEventTool"

-			/>

-			<Tool

-				Name="VCCustomBuildTool"

-			/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"

-			/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

-				Name="VCMIDLTool"

-			/>

-			<Tool

-				Name="VCCLCompilerTool"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="true"

-				DebugInformationFormat="3"

-			/>

-			<Tool

-				Name="VCManagedResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCResourceCompilerTool"

-			/>

-			<Tool

-				Name="VCPreLinkEventTool"

-			/>

-			<Tool

-				Name="VCLibrarianTool"

-			/>

-			<Tool

-				Name="VCALinkTool"

-			/>

-			<Tool

-				Name="VCXDCMakeTool"

-			/>

-			<Tool

-				Name="VCBscMakeTool"

-			/>

-			<Tool

-				Name="VCFxCopTool"

-			/>

-			<Tool

-				Name="VCPostBuildEventTool"

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\contrib\lua\src\lapi.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lapi.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lauxlib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lauxlib.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lbaselib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lcode.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lcode.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ldblib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ldebug.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ldebug.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ldo.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ldo.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ldump.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lfunc.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lfunc.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lgc.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lgc.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\linit.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\liolib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\llex.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\llex.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\llimits.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lmathlib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lmem.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lmem.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\loadlib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lobject.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lobject.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lopcodes.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lopcodes.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\loslib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lparser.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lparser.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lstate.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lstate.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lstring.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lstring.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lstrlib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ltable.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ltable.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ltablib.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ltm.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\ltm.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lua.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\luaconf.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lualib.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lundump.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lundump.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lvm.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lvm.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lzio.c"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\lzio.h"
-			>

-		</File>

-		<File

-			RelativePath="..\contrib\lua\src\print.c"
-			>

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/crawl-ref/source/MSVC/pcre.vcproj b/crawl-ref/source/MSVC/pcre.vcproj
deleted file mode 100644
index 1f4aa13aaa..0000000000
--- a/crawl-ref/source/MSVC/pcre.vcproj
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pcre"
-	ProjectGUID="{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"
-	RootNamespace="pcre"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\Common.vsprops;.\Debug.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;PCRE_STATIC"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\Common.vsprops;.\Release.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;PCRE_STATIC"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\contrib\pcre\pcre.h"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_chartables.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_compile.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_config.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_dfa_exec.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_exec.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_fullinfo.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_get.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_globals.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_info.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_internal.h"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_maketables.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_newline.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_ord2utf8.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_refcount.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_scanner.h"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_study.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_tables.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_try_flipped.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_ucp_searchfuncs.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_valid_utf8.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_version.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\pcre\pcre_xclass.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/crawl-ref/source/MSVC/sqlite.vcproj b/crawl-ref/source/MSVC/sqlite.vcproj
deleted file mode 100644
index 0d3c3a4410..0000000000
--- a/crawl-ref/source/MSVC/sqlite.vcproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="sqlite"
-	ProjectGUID="{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"
-	RootNamespace="sqlite"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\Common.vsprops;.\Debug.vsprops"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_AUTOVACUUM;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_BLOB_LITERAL;SQLITE_OMIT_COMPOUND_SELECT;SQLITE_OMIT_CONFLICT_CLAUSE;SQLITE_OMIT_DATETIME_FUNCS;SQLITE_OMIT_EXPLAIN;SQLITE_OMIT_INTEGRITY_CHECK;SQLITE_OMIT_PAGER_PRAGMAS;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_SCHEMA_PRAGMAS;SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_LOAD_EXTENSION"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\Common.vsprops;.\Release.vsprops"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_AUTOVACUUM;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_BLOB_LITERAL;SQLITE_OMIT_COMPOUND_SELECT;SQLITE_OMIT_CONFLICT_CLAUSE;SQLITE_OMIT_DATETIME_FUNCS;SQLITE_OMIT_EXPLAIN;SQLITE_OMIT_INTEGRITY_CHECK;SQLITE_OMIT_PAGER_PRAGMAS;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_SCHEMA_PRAGMAS;SQLITE_OMIT_SCHEMA_VERSION_PRAGMAS;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_LOAD_EXTENSION"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\contrib\sqlite\sqlite3.c"
-			>
-		</File>
-		<File
-			RelativePath="..\contrib\sqlite\sqlite3.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index be34c67611..3d317f1530 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1255,7 +1255,7 @@ int _calc_breath_ability_range(ability_type ability)
     case ABIL_BREATHE_STICKY_FLAME: return 5;
     case ABIL_BREATHE_STEAM:        return 7;
     default:
-        ASSERT("Bad breath type!");
+        ASSERT(!"Bad breath type!");
         break;
     }
     return (-2);
diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua
-Subproject 9ca5e4ce20daff5a11d19132ada7936d3390680
+Subproject 3b31c62dae61689d5acf66d0a7a7a138bc8e4c9
diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre
-Subproject 27d0ec7ed9034beb3d2d7f0addd8812a8a1ba05
+Subproject 5aac4d787bbed8607a326386a8a943f2ca6c0b7
diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite
-Subproject 44ae8d12a69ffa25c67568ca152379dd364afb2
+Subproject 702864caabf71939b3747d6f9aba6a67fb4f501
diff --git a/crawl-ref/source/it_use2.cc b/crawl-ref/source/it_use2.cc
index bb3d733aae..84cdc0b4ed 100644
--- a/crawl-ref/source/it_use2.cc
+++ b/crawl-ref/source/it_use2.cc
@@ -38,13 +38,14 @@ REVISION("$Rev$");
 // From an actual potion, pow == 40 -- bwr
 bool potion_effect(potion_type pot_eff, int pow, bool drank_it, bool was_known)
 {
+
     bool effect = true;  // current behaviour is all potions id on quaffing
 
     pow = std::min(pow, 150);
 
-    const int factor = (you.species == SP_VAMPIRE
-                        && you.hunger_state < HS_SATIATED
-                        && drank_it ? 2 : 1);
+    int factor = (you.species == SP_VAMPIRE
+                  && you.hunger_state < HS_SATIATED
+                  && drank_it ? 2 : 1);
 
     // Knowingly drinking bad potions is much less amusing.
     int xom_factor = factor;
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index 189a44e8c4..142e1fbcf7 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -8,6 +8,8 @@
 #include "AppHdr.h"
 REVISION("$Rev$");
 
+#ifdef USE_TILE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -411,3 +413,4 @@ int stricmp(const char *str1, const char *str2)
 }
 
 #endif // #ifdef UNIX
+#endif // #ifdef USE_TILE
diff --git a/crawl-ref/source/los.cc b/crawl-ref/source/los.cc
index 4fa567d091..b30bac7249 100644
--- a/crawl-ref/source/los.cc
+++ b/crawl-ref/source/los.cc
@@ -274,8 +274,9 @@ static std::vector<int> _find_minimal_cellrays()
             cellray c(ray, i);
             std::list<cellray>& min = minima(c.end());
 
+            bool erased = false;
             for (min_it = min.begin();
-                 min_it != min.end() && !dup; min_it++)
+                 min_it != min.end() && !dup; )
             {
                 switch(_compare_cellrays(*min_it, c))
                 {
@@ -284,6 +285,7 @@ static std::vector<int> _find_minimal_cellrays()
                     break;
                 case C_SUPERRAY:
                     min_it = min.erase(min_it);
+                    erased = true;
                     // clear this should be added, but might have
                     // to erase more
                     break;
@@ -291,6 +293,10 @@ static std::vector<int> _find_minimal_cellrays()
                 default:
                     break;
                 }
+                if (!erased)
+                    min_it++;
+                else
+                    erased = false;
             }
             if (!dup)
                 min.push_back(c);
diff --git a/crawl-ref/source/platform.h b/crawl-ref/source/platform.h
index 65d4a7d712..40064d5896 100644
--- a/crawl-ref/source/platform.h
+++ b/crawl-ref/source/platform.h
@@ -285,4 +285,11 @@
 #error "Could not detect 32-bit/64-bit architecture."
 #endif
 
+/* ICC on Windows uses VC includes, etc */
+#ifdef TARGET_OS_WINDOWS
+#ifdef TARGET_COMPILER_ICC
+#define TARGET_COMPILER_VC
+#endif
+#endif
+
 #endif
diff --git a/crawl-ref/source/rltiles/tiledef-unrand.cc b/crawl-ref/source/rltiles/tiledef-unrand.cc
index 90d988e582..077d23577f 100644
--- a/crawl-ref/source/rltiles/tiledef-unrand.cc
+++ b/crawl-ref/source/rltiles/tiledef-unrand.cc
@@ -9,6 +9,7 @@
 
 #include "artefact.h"
 #include "tiledef-main.h"
+#include "tiledef-player.h"
 
 int unrandart_to_tile(int unrand)
 {
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 2877e85f33..80915be39e 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -359,7 +359,7 @@ int tileidx_monster_base(const monsters *mon, bool detected)
             TILEP_MONS_VERY_UGLY_THING : TILEP_MONS_UGLY_THING;
         int colour_offset = ugly_thing_colour_offset(mon);
 
-        if (colour_offset == -1 || detected)
+        if (detected || colour_offset == -1)
             colour_offset = 0;
 
         return (ugly_tile + colour_offset);
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index ca7f5bd946..339e5fb298 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -353,10 +353,10 @@ void _mark_excludes_non_updated(const coord_def &p)
             (curr_excludes[i].pos - p).abs() <= curr_excludes[i].radius_sq();
 }
 
-void _update_exclusion_los()
+void _update_exclusion_los(bool all=false)
 {
     for (unsigned int i = 0; i < curr_excludes.size(); i++)
-        if (!curr_excludes[i].uptodate)
+        if (all || !curr_excludes[i].uptodate)
             curr_excludes[i].set_exclude_show();
 }
 
@@ -3387,13 +3387,7 @@ std::string stair_info::describe() const
 void LevelInfo::set_level_excludes()
 {
     curr_excludes = excludes;
-/*
-    for (unsigned int i = 0; i < curr_excludes.size(); i++)
-    {
-        curr_excludes[i] = travel_exclude(curr_excludes[i].pos,
-                                          curr_excludes[i].radius);
-    }
-*/
+    _update_exclusion_los(true);
 }
 
 bool LevelInfo::empty() const
diff --git a/crawl-ref/source/util/art-data.pl b/crawl-ref/source/util/art-data.pl
index 8781c2eff2..a495edd5aa 100755
--- a/crawl-ref/source/util/art-data.pl
+++ b/crawl-ref/source/util/art-data.pl
@@ -943,6 +943,7 @@ HEADER_END
 
 #include "artefact.h"
 #include "tiledef-main.h"
+#include "tiledef-player.h"
 
 int unrandart_to_tile(int unrand)
 {