Merge branch 'master' into trees

author: Adam Borowski <kilobyte@angband.pl> 2009-10-12 23:09:22 +0200
committer: Adam Borowski <kilobyte@angband.pl> 2009-10-12 23:09:22 +0200
commit: c9af2ab4e8f209d5da546d80960ad82521a64a69 (patch)
tree: 96c64ec37997f935194da911033c79d0eaa8a48e /crawl-ref/source
parent: 487e80ffa4d3e30e73ae20aae57711d125492758 (diff)
parent: 64b794703481fcdc61f912743b7e11bea7523d6d (diff)
download: crawl-ref-c9af2ab4e8f209d5da546d80960ad82521a64a69.tar.gz
crawl-ref-c9af2ab4e8f209d5da546d80960ad82521a64a69.zip
54 files changed, 2221 insertions, 494 deletions
diff --git a/crawl-ref/source/AppHdr.cc b/crawl-ref/source/AppHdr.cc
new file mode 100644
index 0000000000..91e3e9f392
--- /dev/null
+++ b/crawl-ref/source/AppHdr.cc
@@ -0,0 +1,3 @@
+
+/* This file is for MSVC to generate a precompiled header */
+#include "AppHdr.h"
+\ No newline at end of file
diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h
index 6a7a4adf48..4014edab30 100644
--- a/crawl-ref/source/AppHdr.h
+++ b/crawl-ref/source/AppHdr.h
@@ -64,10 +64,7 @@
 // especially bad, so we'll want to remap that. OS X is otherwise
 // Unix-ish, so we shouldn't need other special handling.
 //
-#if defined(TARGET_OS_MACOSX)
-    #define USE_8_COLOUR_TERM_MAP
-    #define COL_TO_REPLACE_DARKGREY     BLUE
-#endif
+#define COL_TO_REPLACE_DARKGREY     BLUE
 
 //
 // FreeBSD
@@ -519,6 +516,10 @@ inline void UNUSED(const volatile T &)
 #include "externs.h"
 #include "version.h"
 
+#ifdef TARGET_COMPILER_VC
+#include "libw32c.h"
+#endif
+
 #endif
 
 #endif
diff --git a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
index bbcc108353..76c482425c 100644
--- a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
+++ b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj
@@ -375,6 +375,9 @@
 		B090C2F310671F8900AE855D /* gui.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2EF10671F8900AE855D /* gui.png */; };
 		B090C2F410671F8900AE855D /* main.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2F010671F8900AE855D /* main.png */; };
 		B090C2F510671F8900AE855D /* player.png in Copy Dungeon Tiles */ = {isa = PBXBuildFile; fileRef = B090C2F110671F8900AE855D /* player.png */; };
+		B09CCE3110830F1A00623CFA /* Crawl-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B09CCE3010830F1A00623CFA /* Crawl-Info.plist */; };
+		B09CCE671083159100623CFA /* settings in Resources */ = {isa = PBXBuildFile; fileRef = B09CCE5A1083159100623CFA /* settings */; };
+		B09CCE6C108315B300623CFA /* settings in Resources */ = {isa = PBXBuildFile; fileRef = B09CCE5A1083159100623CFA /* settings */; };
 		B0B5DF6A1066EE1A0020B21F /* libpng.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF201066ED0E0020B21F /* libpng.framework */; };
 		B0B5DF6B1066EE1A0020B21F /* SDL_image.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF221066ED0E0020B21F /* SDL_image.framework */; };
 		B0B5DF6C1066EE1A0020B21F /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = B0B5DF241066ED0E0020B21F /* SDL.framework */; };
@@ -873,6 +876,8 @@
 		B090C2EF10671F8900AE855D /* gui.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = gui.png; path = rltiles/gui.png; sourceTree = "<group>"; };
 		B090C2F010671F8900AE855D /* main.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = main.png; path = rltiles/main.png; sourceTree = "<group>"; };
 		B090C2F110671F8900AE855D /* player.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = player.png; path = rltiles/player.png; sourceTree = "<group>"; };
+		B09CCE3010830F1A00623CFA /* Crawl-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Crawl-Info.plist"; path = "mac/Crawl-Info.plist"; sourceTree = "<group>"; };
+		B09CCE5A1083159100623CFA /* settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = settings; path = ../settings; sourceTree = SOURCE_ROOT; };
 		B0B5DF201066ED0E0020B21F /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/libpng.framework; sourceTree = "<absolute>"; };
 		B0B5DF221066ED0E0020B21F /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = "<absolute>"; };
 		B0B5DF241066ED0E0020B21F /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = /Library/Frameworks/SDL.framework; sourceTree = "<absolute>"; };
@@ -928,7 +933,6 @@
 		D2A72B29101173C000E1A883 /* artefact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = artefact.h; sourceTree = "<group>"; };
 		D2AE25EE0DA2624E00E15489 /* crawl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.perl; name = crawl; path = mac/crawl; sourceTree = "<group>"; };
 		D2F271F60DA1C58C00445FE9 /* Dungeon Crawl Stone Soup - ASCII.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Dungeon Crawl Stone Soup - ASCII.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		D2F271F80DA1C58C00445FE9 /* Crawl-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Crawl-Info.plist"; sourceTree = "<group>"; };
 		D2F271FE0DA1C5AD00445FE9 /* dat */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dat; sourceTree = "<group>"; };
 		D2F2723F0DA1C61600445FE9 /* docs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = docs; path = ../docs; sourceTree = SOURCE_ROOT; };
 		E14D930A107FA77200E3F5FE /* los.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = los.cc; sourceTree = "<group>"; };
@@ -1315,12 +1319,13 @@
 		7B352F1B0B0022C900CABB32 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
+				D2F271FE0DA1C5AD00445FE9 /* dat */,
 				B090C2EE10671F8900AE855D /* dngn.png */,
+				D2F2723F0DA1C61600445FE9 /* docs */,
 				B090C2EF10671F8900AE855D /* gui.png */,
 				B090C2F010671F8900AE855D /* main.png */,
 				B090C2F110671F8900AE855D /* player.png */,
-				D2F2723F0DA1C61600445FE9 /* docs */,
-				D2F271FE0DA1C5AD00445FE9 /* dat */,
+				B09CCE5A1083159100623CFA /* settings */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -1431,7 +1436,7 @@
 		D2AE25EC0DA2621100E15489 /* Mac */ = {
 			isa = PBXGroup;
 			children = (
-				D2F271F80DA1C58C00445FE9 /* Crawl-Info.plist */,
+				B09CCE3010830F1A00623CFA /* Crawl-Info.plist */,
 				D2A696BC0DA29D4E00FDDE82 /* Crawl.icns */,
 				D2AE25EE0DA2624E00E15489 /* crawl */,
 			);
@@ -1596,9 +1601,11 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B09CCE3110830F1A00623CFA /* Crawl-Info.plist in Resources */,
+				B032D6FD106C02540002D70D /* Crawl.icns in Resources */,
 				B032D6FB106C02540002D70D /* dat in Resources */,
 				B032D6FC106C02540002D70D /* docs in Resources */,
-				B032D6FD106C02540002D70D /* Crawl.icns in Resources */,
+				B09CCE671083159100623CFA /* settings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1606,9 +1613,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D2A696BD0DA29D4E00FDDE82 /* Crawl.icns in Resources */,
 				D2F272350DA1C5AD00445FE9 /* dat in Resources */,
 				D2F2725B0DA1C61600445FE9 /* docs in Resources */,
-				D2A696BD0DA29D4E00FDDE82 /* Crawl.icns in Resources */,
+				B09CCE6C108315B300623CFA /* settings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2338,7 +2346,7 @@
 					/Library/Frameworks/SDL_image.framework/Headers,
 					/Library/Frameworks/libpng.framework/Headers,
 				);
-				INFOPLIST_FILE = "Crawl-Info.plist";
+				INFOPLIST_FILE = "mac/Crawl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				PREBINDING = NO;
 				PRODUCT_NAME = "Dungeon Crawl Stone Soup";
@@ -2588,7 +2596,7 @@
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_VERSION = 4.0;
-				INFOPLIST_FILE = "Crawl-Info.plist";
+				INFOPLIST_FILE = "mac/Crawl-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
diff --git a/crawl-ref/source/MSVC/.gitignore b/crawl-ref/source/MSVC/.gitignore
new file mode 100644
index 0000000000..197219d30d
--- /dev/null
+++ b/crawl-ref/source/MSVC/.gitignore
@@ -0,0 +1,5 @@
+bin
+obj
+*.vcproj.*.user
+*.ncb
+*.suo
diff --git a/crawl-ref/source/MSVC/Common.vsprops b/crawl-ref/source/MSVC/Common.vsprops
new file mode 100644
index 0000000000..a24da65f90
--- /dev/null
+++ b/crawl-ref/source/MSVC/Common.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Common"
+	OutputDirectory="$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)"
+	IntermediateDirectory="$(SolutionDir)\obj\$(ProjectName)\$(ConfigurationName)"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		MinimalRebuild="true"
+	/>
+</VisualStudioPropertySheet>
diff --git a/crawl-ref/source/MSVC/Console.vsprops b/crawl-ref/source/MSVC/Console.vsprops
new file mode 100644
index 0000000000..9937955be8
--- /dev/null
+++ b/crawl-ref/source/MSVC/Console.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Console"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="WIN32CONSOLE"
+	/>
+</VisualStudioPropertySheet>
diff --git a/crawl-ref/source/MSVC/Debug.vsprops b/crawl-ref/source/MSVC/Debug.vsprops
new file mode 100644
index 0000000000..6a0b290a64
--- /dev/null
+++ b/crawl-ref/source/MSVC/Debug.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Debug"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		RuntimeLibrary="1"
+	/>
+</VisualStudioPropertySheet>
diff --git a/crawl-ref/source/MSVC/Release.vsprops b/crawl-ref/source/MSVC/Release.vsprops
new file mode 100644
index 0000000000..34cdffd24d
--- /dev/null
+++ b/crawl-ref/source/MSVC/Release.vsprops
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Release"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="2"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		WholeProgramOptimization="false"
+		RuntimeLibrary="0"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		IgnoreDefaultLibraryNames="MSVCRT"
+	/>
+</VisualStudioPropertySheet>
diff --git a/crawl-ref/source/MSVC/Tiles.vsprops b/crawl-ref/source/MSVC/Tiles.vsprops
new file mode 100644
index 0000000000..9fc3b2bcbf
--- /dev/null
+++ b/crawl-ref/source/MSVC/Tiles.vsprops
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Tiles"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="C:\SDKs\SDL\include;C:\SDKs\SDL_image\include;C:\SDKs\libpng\include;C:\SDKs\zlib\include;C:\SDKs\freetype\include"
+		PreprocessorDefinitions="WIN32TILES;USE_TILE"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="SDL.lib SDL_image.lib SDLmain.lib libpng.lib zlib.lib freetype.lib opengl32.lib glu32.lib"
+		AdditionalLibraryDirectories="C:\SDKs\SDL\lib;C:\SDKs\SDL_image\lib;C:\SDKs\libpng\lib;C:\SDKs\zlib\lib;C:\SDKs\freetype\lib"
+	/>
+</VisualStudioPropertySheet>
diff --git a/crawl-ref/source/MSVC/crawl-ref.sln b/crawl-ref/source/MSVC/crawl-ref.sln
index 71c70c8d63..9056563d63 100644
--- a/crawl-ref/source/MSVC/crawl-ref.sln
+++ b/crawl-ref/source/MSVC/crawl-ref.sln
@@ -1,27 +1,92 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crawl-ref", "crawl-ref.vcproj", "{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crawl", "crawl.vcproj", "{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}"
 	ProjectSection(ProjectDependencies) = postProject
+		{5783572B-479A-4EE8-8F16-1FDB24DDD1A0} = {5783572B-479A-4EE8-8F16-1FDB24DDD1A0}
+		{DAE92A45-087B-445B-8E94-BA864173A73F} = {DAE92A45-087B-445B-8E94-BA864173A73F}
 		{A61349B6-4099-4688-AA1A-00D91397857D} = {A61349B6-4099-4688-AA1A-00D91397857D}
+		{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}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite.vcproj", "{5783572B-479A-4EE8-8F16-1FDB24DDD1A0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "pcre.vcproj", "{A0FDC72E-0BE5-4542-B381-6A482DAC2125}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilegen", "tilegen.vcproj", "{DAE92A45-087B-445B-8E94-BA864173A73F}"
+EndProject
 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|Win32.ActiveCfg = Debug|Win32
-		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Debug|Win32.Build.0 = Debug|Win32
-		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release|Win32.ActiveCfg = Release|Win32
-		{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}.Release|Win32.Build.0 = Release|Win32
+		{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-ref.vcproj b/crawl-ref/source/MSVC/crawl.vcproj
index ca925aae4e..b93b357894 100644
--- a/crawl-ref/source/MSVC/crawl-ref.vcproj
+++ b/crawl-ref/source/MSVC/crawl.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="crawl-ref"
+	Name="crawl"
 	ProjectGUID="{3189AF12-90EF-4D3E-BFEC-4AB90D7D32DA}"
 	RootNamespace="crawlref"
 	Keyword="Win32Proj"
@@ -16,11 +16,12 @@
 	</ToolFiles>
 	<Configurations>
 		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug Console|Win32"
+			OutputDirectory="$(SolutionDir)\.."
 			ConfigurationType="1"
+			InheritedPropertySheets=".\Debug.vsprops;.\Console.vsprops;.\Common.vsprops"
 			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -40,11 +41,10 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../util/lua/src;../util/sqlite"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H"
+				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="AppHdr.h"
 				WarningLevel="3"
@@ -94,12 +94,167 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Release Console|Win32"
+			OutputDirectory="$(SolutionDir)\.."
 			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
+			InheritedPropertySheets=".\Release.vsprops;.\Console.vsprops;.\Common.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/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"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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|Win32"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Debug.vsprops;.\Common.vsprops;.\Tiles.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/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="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				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="Release Tiles|Win32"
+			OutputDirectory="$(SolutionDir)\.."
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Release.vsprops;.\Common.vsprops;.\Tiles.vsprops"
+			CharacterSet="0"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -118,9 +273,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../util/lua/src;../util/sqlite"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H"
-				RuntimeLibrary="2"
+				AdditionalIncludeDirectories=".;..;../util/lua/src;../util/sqlite;../util/pcre;../rltiles"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;YY_NO_UNISTD_H;_USE_MATH_DEFINES"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="AppHdr.h"
 				WarningLevel="3"
@@ -194,8 +348,20 @@
 		<File
 			RelativePath="..\acr.cc"
 			>
+		</File>
+		<File
+			RelativePath="..\AppHdr.cc"
+			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Release Console|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -203,7 +369,15 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="1"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -216,6 +390,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\arena.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\arena.h"
+			>
+		</File>
+		<File
+			RelativePath="..\artefact.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\artefact.h"
+			>
+		</File>
+		<File
 			RelativePath="..\beam.cc"
 			>
 		</File>
@@ -224,6 +414,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\bitary.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\bitary.h"
+			>
+		</File>
+		<File
 			RelativePath="..\branch.cc"
 			>
 		</File>
@@ -272,10 +470,30 @@
 			>
 		</File>
 		<File
+			RelativePath="..\crash-w.cc"
+			>
+		</File>
+		<File
 			RelativePath="..\database.cc"
 			>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -283,7 +501,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Release Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -388,11 +606,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\fixary.h"
+			RelativePath="..\fixary.h"
 			>
 		</File>
 		<File
-			RelativePath="..\fixvec.h"
+			RelativePath="..\fixvec.h"
 			>
 		</File>
 		<File
@@ -496,7 +714,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\kills.h"
+			RelativePath="..\kills.h"
 			>
 		</File>
 		<File
@@ -508,6 +726,90 @@
 			>
 		</File>
 		<File
+			RelativePath="..\prebuilt\levcomp.lex.cc"
+			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\prebuilt\levcomp.tab.cc"
+			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\prebuilt\levcomp.tab.h"
+			>
+		</File>
+		<File
+			RelativePath="..\libgui.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\libgui.h"
+			>
+		</File>
+		<File
 			RelativePath="..\libutil.cc"
 			>
 		</File>
@@ -519,7 +821,7 @@
 			RelativePath="..\libw32c.cc"
 			>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Debug Console|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -527,7 +829,23 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="2"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -540,6 +858,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\los.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\los.h"
+			>
+		</File>
+		<File
+			RelativePath="..\losparam.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\losparam.h"
+			>
+		</File>
+		<File
 			RelativePath="..\luadgn.cc"
 			>
 		</File>
@@ -624,6 +958,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\mon-los.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\mon-los.h"
+			>
+		</File>
+		<File
 			RelativePath="..\mon-pick.cc"
 			>
 		</File>
@@ -680,10 +1022,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\msvc.h"
+			>
+		</File>
+		<File
 			RelativePath="..\mt19937ar.cc"
 			>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -691,7 +1045,15 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -776,11 +1138,15 @@
 			>
 		</File>
 		<File
-			RelativePath="..\randart.cc"
+			RelativePath="..\quiver.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\quiver.h"
 			>
 		</File>
 		<File
-			RelativePath="..\randart.h"
+			RelativePath="..\ray.cc"
 			>
 		</File>
 		<File
@@ -872,6 +1238,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\spl-mis.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\spl-mis.h"
+			>
+		</File>
+		<File
 			RelativePath="..\spl-util.cc"
 			>
 		</File>
@@ -888,81 +1262,291 @@
 			>
 		</File>
 		<File
-			RelativePath="..\util\sqlite\sqlite3.c"
+			RelativePath="..\stash.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\stash.h"
+			>
+		</File>
+		<File
+			RelativePath="..\state.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\state.h"
+			>
+		</File>
+		<File
+			RelativePath="..\store.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\store.h"
+			>
+		</File>
+		<File
+			RelativePath="..\stuff.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\stuff.h"
+			>
+		</File>
+		<File
+			RelativePath="..\tags.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\tags.h"
+			>
+		</File>
+		<File
+			RelativePath="..\terrain.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\terrain.h"
+			>
+		</File>
+		<File
+			RelativePath="..\tile2.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\tilebuf.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\tilebuf.h"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tiledef-dngn.cc"
 			>
 			<FileConfiguration
-				Name="Debug|Win32"
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
 					UsePrecompiledHeader="0"
-					WarningLevel="0"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Release Tiles|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
 					UsePrecompiledHeader="0"
-					WarningLevel="0"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\stash.cc"
+			RelativePath="..\rltiles\tiledef-dngn.h"
 			>
 		</File>
 		<File
-			RelativePath="..\stash.h"
+			RelativePath="..\rltiles\tiledef-gui.cc"
 			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\state.cc"
+			RelativePath="..\rltiles\tiledef-gui.h"
 			>
 		</File>
 		<File
-			RelativePath="..\state.h"
+			RelativePath="..\rltiles\tiledef-main.cc"
 			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\store.cc"
+			RelativePath="..\rltiles\tiledef-main.h"
 			>
 		</File>
 		<File
-			RelativePath="..\store.h"
+			RelativePath="..\rltiles\tiledef-player.cc"
 			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\stuff.cc"
+			RelativePath="..\rltiles\tiledef-player.h"
 			>
 		</File>
 		<File
-			RelativePath="..\stuff.h"
+			RelativePath="..\rltiles\tiledef-unrand.cc"
 			>
+			<FileConfiguration
+				Name="Debug Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Console|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release Tiles|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					UsePrecompiledHeader="0"
+				/>
+			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\tags.cc"
+			RelativePath="..\rltiles\tiledef-unrand.h"
 			>
 		</File>
 		<File
-			RelativePath="..\tags.h"
+			RelativePath="..\tilefont.cc"
 			>
 		</File>
 		<File
-			RelativePath="..\terrain.cc"
+			RelativePath="..\tilefont.h"
 			>
 		</File>
 		<File
-			RelativePath="..\terrain.h"
+			RelativePath="..\tilemcache.cc"
 			>
 		</File>
 		<File
-			RelativePath="..\tile1.cc"
+			RelativePath="..\tilemcache.h"
 			>
 		</File>
 		<File
-			RelativePath="..\tile2.cc"
+			RelativePath="..\tilepick.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\tilereg.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\tilereg.h"
 			>
 		</File>
 		<File
@@ -970,6 +1554,22 @@
 			>
 		</File>
 		<File
+			RelativePath="..\tilesdl.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\tilesdl.h"
+			>
+		</File>
+		<File
+			RelativePath="..\tiletex.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\tiletex.h"
+			>
+		</File>
+		<File
 			RelativePath="..\transfor.cc"
 			>
 		</File>
@@ -1006,6 +1606,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\version.cc"
+			>
+		</File>
+		<File
 			RelativePath="..\version.h"
 			>
 		</File>
diff --git a/crawl-ref/source/MSVC/lua.vcproj b/crawl-ref/source/MSVC/lua.vcproj
index 2c57cd692d..0f9e53a8c3 100644
--- a/crawl-ref/source/MSVC/lua.vcproj
+++ b/crawl-ref/source/MSVC/lua.vcproj
@@ -17,9 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
+			InheritedPropertySheets=".\Common.vsprops;.\Debug.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -43,7 +42,6 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -79,9 +77,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
+			InheritedPropertySheets=".\Common.vsprops;.\Release.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -103,7 +100,6 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
diff --git a/crawl-ref/source/MSVC/pcre.vcproj b/crawl-ref/source/MSVC/pcre.vcproj
new file mode 100644
index 0000000000..2bca04c5d8
--- /dev/null
+++ b/crawl-ref/source/MSVC/pcre.vcproj
@@ -0,0 +1,235 @@
+<?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="..\util\pcre\pcre.h"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_chartables.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_compile.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_config.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_dfa_exec.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_exec.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_fullinfo.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_get.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_globals.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_info.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_internal.h"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_maketables.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_newline.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_ord2utf8.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_refcount.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_scanner.h"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_study.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_tables.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_try_flipped.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_ucp_searchfuncs.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_valid_utf8.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\pcre\pcre_version.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\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
new file mode 100644
index 0000000000..72f023ad76
--- /dev/null
+++ b/crawl-ref/source/MSVC/sqlite.vcproj
@@ -0,0 +1,151 @@
+<?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="..\util\sqlite\sqlite3.c"
+			>
+		</File>
+		<File
+			RelativePath="..\util\sqlite\sqlite3.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/crawl-ref/source/MSVC/stdint.h b/crawl-ref/source/MSVC/stdint.h
new file mode 100644
index 0000000000..c66fbb817c
--- /dev/null
+++ b/crawl-ref/source/MSVC/stdint.h
@@ -0,0 +1,247 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
+//
+//  Copyright (c) 2006-2008 Alexander Chemeris
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+//
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+//
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode and for many Visual Studio versions when
+// compiling for ARM we should wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#ifdef __cplusplus
+extern "C" {
+#endif
+#  include <wchar.h>
+#ifdef __cplusplus
+}
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+
+// Visual Studio 6 and Embedded Visual C++ 4 doesn't
+// realize that, e.g. char has the same size as __int8
+// so we give up on __intX for them.
+#if (_MSC_VER < 1300)
+   typedef signed char       int8_t;
+   typedef signed short      int16_t;
+   typedef signed int        int32_t;
+   typedef unsigned char     uint8_t;
+   typedef unsigned short    uint16_t;
+   typedef unsigned int      uint32_t;
+#else
+   typedef signed __int8     int8_t;
+   typedef signed __int16    int16_t;
+   typedef signed __int32    int32_t;
+   typedef unsigned __int8   uint8_t;
+   typedef unsigned __int16  uint16_t;
+   typedef unsigned __int32  uint32_t;
+#endif
+typedef signed __int64       int64_t;
+typedef unsigned __int64     uint64_t;
+
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef signed __int64    intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 signed int   intptr_t;
+   typedef _W64 unsigned int uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/crawl-ref/source/MSVC/tilegen.vcproj b/crawl-ref/source/MSVC/tilegen.vcproj
new file mode 100644
index 0000000000..1a7e979d01
--- /dev/null
+++ b/crawl-ref/source/MSVC/tilegen.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="tilegen"
+	ProjectGUID="{DAE92A45-087B-445B-8E94-BA864173A73F}"
+	RootNamespace="tilegen"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Common.vsprops;.\Tiles.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;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				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"
+				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			ConfigurationType="1"
+			InheritedPropertySheets=".\Common.vsprops;.\Tiles.vsprops;.\Release.vsprops"
+			CharacterSet="1"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="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"
+				CommandLine="cd &quot;$(SolutionDir)\..\rltiles&quot;&#x0D;&#x0A;echo Generating main.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-main.txt&#x0D;&#x0A;echo Generating dngn.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-dngn.txt&#x0D;&#x0A;echo Generating player.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-player.txt&#x0D;&#x0A;echo Generating gui.png...&#x0D;&#x0A;&quot;$(SolutionDir)\bin\$(ProjectName)\$(ConfigurationName)\$(ProjectName).exe&quot; dc-gui.txt&#x0D;&#x0A;copy *.png ..\dat\tiles\"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\rltiles\tool\main.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile.h"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile_colour.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile_colour.h"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile_list_processor.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile_list_processor.h"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile_page.cc"
+			>
+		</File>
+		<File
+			RelativePath="..\rltiles\tool\tile_page.h"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/crawl-ref/source/acrawl.gdt b/crawl-ref/source/acrawl.gdt
deleted file mode 100644
index 3406830926..0000000000
--- a/crawl-ref/source/acrawl.gdt
+++ /dev/null
diff --git a/crawl-ref/source/acrawl.gpr b/crawl-ref/source/acrawl.gpr
deleted file mode 100644
index 321e91e8e3..0000000000
--- a/crawl-ref/source/acrawl.gpr
+++ /dev/null
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index b612ae9226..0d8597433c 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -1214,7 +1214,7 @@ static bool _init_artefact_book(item_def &book)
     god_type god;
     bool redo = (!origin_is_god_gift(book, &god) || god != GOD_XOM);
 
-    // Plus and plus2 contain parameters to make_book_foo_randart()
+    // Plus and plus2 contain parameters to make_book_foo_randart(),
     // which might get changed after the book has been made into a
     // randart, so reset them on each iteration of the loop.
     int  plus  = book.plus;
@@ -1226,7 +1226,7 @@ static bool _init_artefact_book(item_def &book)
         book.plus2 = plus2;
 
         if (book.sub_type == BOOK_RANDART_LEVEL)
-            // The parameters to this call are encoded in book.plus and plus2
+            // The parameters to this call are in book.plus and plus2.
             book_good = make_book_level_randart(book, book.plus, book.plus2);
         else
             book_good = make_book_theme_randart(book);
@@ -1250,7 +1250,7 @@ static bool _init_artefact_properties(item_def &item)
     if (!props.exists( ARTEFACT_PROPS_KEY ))
         props[ARTEFACT_PROPS_KEY].new_vector(SV_SHORT).resize(ART_PROPERTIES);
 
-    CrawlVector &rap = props[ARTEFACT_PROPS_KEY];
+    CrawlVector &rap = props[ARTEFACT_PROPS_KEY].get_vector();
     rap.set_max_size(ART_PROPERTIES);
 
     for (vec_size i = 0; i < ART_PROPERTIES; i++)
@@ -1901,14 +1901,14 @@ bool make_item_blessed_blade( item_def &item )
 
     ASSERT(!item.props.exists( KNOWN_PROPS_KEY ));
     item.props[KNOWN_PROPS_KEY].new_vector(SV_BOOL).resize(ART_PROPERTIES);
-    CrawlVector &known = item.props[KNOWN_PROPS_KEY];
+    CrawlVector &known = item.props[KNOWN_PROPS_KEY].get_vector();
     known.set_max_size(ART_PROPERTIES);
     for (vec_size i = 0; i < ART_PROPERTIES; i++)
         known[i] = (bool) false;
 
     ASSERT(!item.props.exists( ARTEFACT_PROPS_KEY ));
     item.props[ARTEFACT_PROPS_KEY].new_vector(SV_SHORT).resize(ART_PROPERTIES);
-    CrawlVector &rap = item.props[ARTEFACT_PROPS_KEY];
+    CrawlVector &rap = item.props[ARTEFACT_PROPS_KEY].get_vector();
     rap.set_max_size(ART_PROPERTIES);
     for (vec_size i = 0; i < ART_PROPERTIES; i++)
         rap[i] = (short) 0;
@@ -1964,7 +1964,7 @@ bool make_item_randart( item_def &item )
     ASSERT(!item.props.exists( ARTEFACT_NAME_KEY ));
     ASSERT(!item.props.exists( ARTEFACT_APPEAR_KEY ));
     item.props[KNOWN_PROPS_KEY].new_vector(SV_BOOL).resize(ART_PROPERTIES);
-    CrawlVector &known = item.props[KNOWN_PROPS_KEY];
+    CrawlVector &known = item.props[KNOWN_PROPS_KEY].get_vector();
     known.set_max_size(ART_PROPERTIES);
     for (vec_size i = 0; i < ART_PROPERTIES; i++)
         known[i] = (bool) false;
@@ -2017,7 +2017,7 @@ bool make_item_unrandart( item_def &item, int unrand_index )
     if (!item.props.exists( KNOWN_PROPS_KEY ))
     {
         item.props[KNOWN_PROPS_KEY].new_vector(SV_BOOL).resize(ART_PROPERTIES);
-        CrawlVector &known = item.props[KNOWN_PROPS_KEY];
+        CrawlVector &known = item.props[KNOWN_PROPS_KEY].get_vector();
         known.set_max_size(ART_PROPERTIES);
         for (vec_size i = 0; i < ART_PROPERTIES; i++)
             known[i] = (bool) false;
diff --git a/crawl-ref/source/crawl.gdt b/crawl-ref/source/crawl.gdt
deleted file mode 100644
index 11ea870110..0000000000
--- a/crawl-ref/source/crawl.gdt
+++ /dev/null
diff --git a/crawl-ref/source/crawl.gpr b/crawl-ref/source/crawl.gpr
deleted file mode 100644
index 9ff1dd051f..0000000000
--- a/crawl-ref/source/crawl.gpr
+++ /dev/null
diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index ce4a4e70ac..4c3e468e2c 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -504,3 +504,36 @@ Cnef'fen...ngh'hgnC
 Cnnnnnnn...nnnnnnnC
 CCCCCCCC+++CCCCCCCC
 ENDMAP
+
+###################################################################
+# Distorted kobolds (Jude)
+NAME:   due_chaos_kobolds
+DEPTH:  D:13-27, Vault, Elf, Crypt
+ORIENT: float
+KFEAT:  L = altar_lugonu
+KFEAT:  P = enter_abyss
+KFEAT:  e = .
+KFEAT:  1 = .
+COLOUR: . = random
+COLOUR: 1 = random
+MARKER: e = lua:fog_machine { cloud_type="purple smoke", walk_dist=1, size=9, \
+            pow_max=20, delay=10, buildup_amnt=14, buildup_time=7, \
+            spread_rate=3, start_clouds=1 }
+: kmons("1 = kobold w:" .. you.absdepth() .. " ; quick blade ego:distortion w:6 |" ..
+:       "                  sabre ego:distortion | short sword ego:distortion" ..
+:       "  / kobold w:80 ; short sword | sabre | quick blade w:3")
+MAP
+  ccccc
+ cc...cc
+cc.eP..cc
+ cc...cc
+ ccc.cccc
+cc......ccc
+c...111...c
+cc..1L1..cc
+c...111...c
+ccc......cc
+  ccc..ccc
+    c++c
+     @@
+ENDMAP
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index d5ab3d7864..78d658bb87 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -1,6 +1,6 @@
 ################################################################################
 # lair.des: All maps relating to the Lair system, including entries and end
-#           branch endings for Shoals, Snake Pit, Slime Pit and Swamp.
+#           branch endings for Snake Pit, Slime Pit and Swamp.
 ################################################################################
 
 ################################################################################
@@ -666,99 +666,6 @@ ENDMAP
 ##############################################################################
 
 ##############################################################################
-# Shoals specific non-ending vaults
-##############################################################################
-
-
-###########################
-# Shoal Ruins - nothing special, just some flavor (Enne)
-# Appear rarely.
-#
-NAME:   overgrown_hall
-DEPTH:  Shoal
-WEIGHT: 2
-MONS:   plant, fungus
-MONS:   cyclops / stone giant w:2
-SUBST:  x = x:20 .
-SUBST:  G = G:40 .
-SUBST:  . = .:90 1:19 x:1
-SUBST:  1 = 1 2:1
-MAP
-xxxxxxxxxxx
-x.........x
-x.G.G.G.G.x
-+....3....+
-x.G.G.G.G.x
-x.........x
-xxxxxxxxxxx
-ENDMAP
-
-NAME:   overgrown_tower
-DEPTH:  Shoal
-WEIGHT: 2
-MONS:   plant, fungus
-SUBST:  + = x +
-SUBST:  x = x:60 . '
-SUBST:  ' = ' 1:5
-SUBST:  . = . 2:1
-SUBST:  ' = .
-MAP
- '''''''''
-'''xx+xx'''
-''xx...xx''
-'xx.....xx'
-'x.......x'
-'x...<...x'
-'x.......x'
-'xx.....xx'
-''xx...xx''
-'''xxxxx'''
- '''''''''
-ENDMAP
-
-NAME:   overgrown_statue
-DEPTH:  Shoal
-WEIGHT: 1
-MONS:   plant
-MONS:   ice statue / orange crystal statue / silver statue
-SUBST:  . = 1:1 .:30
-SUBST:  p = 1:2 .
-SUBST:  P = 1:20 .
-SUBST:  G = G 2
-MAP
-  ........
- ..........
-....ppp.....
-...ppppp....
-..ppPPPpp...
-..ppPGPpp...
-..ppPPPpp...
-...ppppp....
-....ppp.....
- ..........
-  ........
-ENDMAP
-
-NAME:   shoals_oasis
-DEPTH:  Shoal
-WEIGHT: 1
-MONS:   plant
-SUBST:  . = 1:1 .
-SUBST:  W = W .
-SUBST:  w = W w
-SUBST:  _ = w
-MAP
-  ...
- ..W..
-..WwW..
-.Ww_wW.
-..WwW..
- ..W..
-  ...
-ENDMAP
-
-
-##############################################################################
 # Slime Pit specific non-ending vaults
 ##############################################################################
 
@@ -798,168 +705,11 @@ ccccc
 ENDMAP
 
 ##############################################################################
-# Branch ends: Shoal, Slime Pit, Snake Pit, Swamp
+# Branch ends: Slime Pit, Snake Pit, Swamp
 # Note that the Shoals usually have a randomised end map; predrawn maps
 # (which need not be encompassing) are sometimes used, though.
 ##############################################################################
 
-##############################################################################
-# Shoals: ranged attackers
-#
-NAME:   Shoal_1
-PLACE:  Shoal:5
-TAGS:   water_ok
-WEIGHT: 0
-MONS:   cyclops, yaktaur, yaktaur captain
-MAP
-wwwwwwwwcccccccccccccwwwwwww
-wwwwwcccc...wwwwwwwwcccwwwww
-wwwccc......wwwwwwwwwwcccwww
-wwcc.......wwwwwwwwwwwwwccww
-wwc........wwwwwwwwwwwwwwcww
-wcc........wwwwwwwwwwwwwwccw
-wc........wwwwwwwwwwwwwwwwcw
-wc........wwwwwwwwwwwwwwwwcw
-cc.2.2.2.2wwwwwwwwwwwwwwwwcc
-c.2.2.2.2.cwwwwwwwwwwwwwwwwc
-c2.3.3.2.ccwwwwwwwwwwwwwwwwc
-c.2.3.2.ccwwwwwwwwwwwwwwww.c
-c2.3.3.ccwwwwwww...wwwwww..c
-ccccccccwwwwwww..1..wwwww..c
-wwwwwwwwwwwwwww..1..wwwww.Oc
-ccccccccwwwwwww..1..wwwww..c
-c..3.3.ccwwwwwww...wwwwww..c
-c.2.3.2.ccwwwwwwwwwwwwwwww.c
-c2.3.3.2.ccwwwwwwwwwwwwwwwwc
-c.2.2.2.2.cwwwwwwwwwwwwwwwwc
-cc.2.2.2.2wwwwwwwwwwwwwwwwcc
-wc........wwwwwwwwwwwwwwwwcw
-wc........wwwwwwwwwwwwwwwwcw
-wcc........wwwwwwwwwwwwwwccw
-wwc........wwwwwwwwwwwwwwcww
-wwcc.......wwwwwwwwwwwwwccww
-wwwccc......wwwwwwwwwwwccwww
-wwwwwcccc...wwwwwwwwcccwwwww
-wwwwwwwwcccccccccccccwwwwwww
-ENDMAP
-
-##############################################################################
-# Shoals: fish
-#
-NAME:   Shoal_2
-PLACE:  Shoal:5
-TAGS:   water_ok
-WEIGHT: 0
-MONS:   cyclops,stone giant
-SUBST:  1 = 1.
-SUBST:  W = W:2 w
-SUBST:  . = . w:3
-KMONS:  W = giant goldfish/big fish/electric eel
-KFEAT:  W = w
-MAP
-wwwww......11......wwwww
-www.....1WWWWWW1.....www
-ww....WWWWWWWWWWWW....ww
-w..1WWWWWWWWWWWWWWWW1..w
-w..WWWWWWWWWWWWWWWWWW..w
-...WWWWWWWWWWWWWWWWWW...
-..WWWWWWWWWWWWWWWWWWWW..
-..WWWWWWWWWWWWWWWWWWWW..
-.1WWWWWWWWWWWWWWWWWWWW1.
-.WWWWWWWWWWWWWWWWWWWWWW.
-.WWWWWWWWWWWWWWWWWWWWWW.
-1WWWWWWWWWWO2WWWWWWWWWW1
-1WWWWWWWWWW22WWWWWWWWWW1
-.WWWWWWWWWWWWWWWWWWWWWW.
-.WWWWWWWWWWWWWWWWWWWWWW.
-.1WWWWWWWWWWWWWWWWWWWW1.
-..WWWWWWWWWWWWWWWWWWWW..
-..WWWWWWWWWWWWWWWWWWWW..
-w..WWWWWWWWWWWWWWWWWW..w
-w..1WWWWWWWWWWWWWWWW1..w
-ww....WWWWWWWWWWWW....ww
-www.....1WWWWWW1.....www
-wwwww......11......wwwww
-ENDMAP
-
-##############################################################################
-# Shoals: statue on rune
-#
-NAME:   Shoal_3
-PLACE:  Shoal:5
-TAGS:   water_ok
-WEIGHT: 0
-KMONS:  x : ice statue / orange crystal statue / silver statue
-KFEAT:  x : O
-MAP
-x
-ENDMAP
-
-##############################################################################
-# Shoals: swimming rune
-#
-# You may need controlled flight or apportation to get the liquid rune
-#
-NAME:   Shoal_4
-PLACE:  Shoal:5
-TAGS:   water_ok
-WEIGHT: 0
-KFEAT:  O = w
-### KITEM: O = liquid rune of Zot
-MAP
-....wwwww....
-..wwwwwww..
-.wwwwwwww.
-.wwwwwwww.
-wwwwwwwww
-wwwwwwwww
-wwwwOwwww
-wwwwwwwww
-wwwwwwwww
-.wwwwwwww.
-.wwwwwwww.
-..wwwwwww..
-....wwwww....
-ENDMAP
-
-################################################################################
-# Shoal hut with rune inside
-#
-# Shoal:$ is hand-hacked to force lots of minivaults.
-NAME:      shoalhut_rune
-TAGS:      shoal_rune water_ok
-SHUFFLE:   ABCD
-SUBST:     A:x, B:x, C:x=, D=+
-LROCKTILE:  wall_vines
-MAP
-.xxCxx.
-xx...xx
-x.....x
-B..O..D
-x.....x
-xx...xx
-.xxAxx
-ENDMAP
-
-################################################################################
-# Shoal hut with no rune inside
-#
-# Shoal:$ is hand-hacked to force lots of minivaults.
-NAME:    shoalhut_norune
-DEPTH:   Shoal:$
-TAGS:    allow_dup water_ok shoal
-SHUFFLE: ABCD
-SUBST:   A:x, B:x, C:x=, D=+
-MAP
-.xxCxx.
-xx...xx
-x.....x
-B..|..D
-x.....x
-xx...xx
-.xxAxx
-ENDMAP
-
 ################################################################################
 # Slime Pit
 #
diff --git a/crawl-ref/source/dat/shoals.des b/crawl-ref/source/dat/shoals.des
new file mode 100644
index 0000000000..12e6803c84
--- /dev/null
+++ b/crawl-ref/source/dat/shoals.des
@@ -0,0 +1,259 @@
+################################################################################
+# shoals.des: All vaults for the Shoals.
+################################################################################
+
+##############################################################################
+# Non-ending vaults
+##############################################################################
+
+
+###########################
+# Shoal Ruins - nothing special, just some flavor (Enne)
+# Appear rarely.
+#
+NAME:   overgrown_hall
+DEPTH:  Shoal
+WEIGHT: 2
+MONS:   plant, fungus
+MONS:   cyclops / stone giant w:2
+SUBST:  x = x:20 .
+SUBST:  G = G:40 .
+SUBST:  . = .:90 1:19 x:1
+SUBST:  1 = 1 2:1
+MAP
+xxxxxxxxxxx
+x.........x
+x.G.G.G.G.x
++....3....+
+x.G.G.G.G.x
+x.........x
+xxxxxxxxxxx
+ENDMAP
+
+NAME:   overgrown_tower
+DEPTH:  Shoal
+WEIGHT: 2
+MONS:   plant, fungus
+SUBST:  + = x +
+SUBST:  x = x:60 . '
+SUBST:  ' = ' 1:5
+SUBST:  . = . 2:1
+SUBST:  ' = .
+MAP
+ '''''''''
+'''xx+xx'''
+''xx...xx''
+'xx.....xx'
+'x.......x'
+'x...<...x'
+'x.......x'
+'xx.....xx'
+''xx...xx''
+'''xxxxx'''
+ '''''''''
+ENDMAP
+
+NAME:   overgrown_statue
+DEPTH:  Shoal
+WEIGHT: 1
+MONS:   plant
+MONS:   ice statue / orange crystal statue / silver statue
+SUBST:  . = 1:1 .:30
+SUBST:  p = 1:2 .
+SUBST:  P = 1:20 .
+SUBST:  G = G 2
+MAP
+  ........
+ ..........
+....ppp.....
+...ppppp....
+..ppPPPpp...
+..ppPGPpp...
+..ppPPPpp...
+...ppppp....
+....ppp.....
+ ..........
+  ........
+ENDMAP
+
+NAME:   shoals_oasis
+DEPTH:  Shoal
+WEIGHT: 1
+MONS:   plant
+SUBST:  . = 1:1 .
+SUBST:  W = W .
+SUBST:  w = W w
+SUBST:  _ = w
+MAP
+  ...
+ ..W..
+..WwW..
+.Ww_wW.
+..WwW..
+ ..W..
+  ...
+ENDMAP
+
+
+##############################################################################
+# Branch ends.
+# Note that the Shoals usually have a randomised end map; predrawn maps
+# (which need not be encompassing) are sometimes used, though.
+##############################################################################
+
+##############################################################################
+# Shoals: ranged attackers
+#
+NAME:   Shoal_1
+PLACE:  Shoal:5
+TAGS:   water_ok
+WEIGHT: 0
+MONS:   cyclops, yaktaur, yaktaur captain
+MAP
+wwwwwwwwcccccccccccccwwwwwww
+wwwwwcccc...wwwwwwwwcccwwwww
+wwwccc......wwwwwwwwwwcccwww
+wwcc.......wwwwwwwwwwwwwccww
+wwc........wwwwwwwwwwwwwwcww
+wcc........wwwwwwwwwwwwwwccw
+wc........wwwwwwwwwwwwwwwwcw
+wc........wwwwwwwwwwwwwwwwcw
+cc.2.2.2.2wwwwwwwwwwwwwwwwcc
+c.2.2.2.2.cwwwwwwwwwwwwwwwwc
+c2.3.3.2.ccwwwwwwwwwwwwwwwwc
+c.2.3.2.ccwwwwwwwwwwwwwwww.c
+c2.3.3.ccwwwwwww...wwwwww..c
+ccccccccwwwwwww..1..wwwww..c
+wwwwwwwwwwwwwww..1..wwwww.Oc
+ccccccccwwwwwww..1..wwwww..c
+c..3.3.ccwwwwwww...wwwwww..c
+c.2.3.2.ccwwwwwwwwwwwwwwww.c
+c2.3.3.2.ccwwwwwwwwwwwwwwwwc
+c.2.2.2.2.cwwwwwwwwwwwwwwwwc
+cc.2.2.2.2wwwwwwwwwwwwwwwwcc
+wc........wwwwwwwwwwwwwwwwcw
+wc........wwwwwwwwwwwwwwwwcw
+wcc........wwwwwwwwwwwwwwccw
+wwc........wwwwwwwwwwwwwwcww
+wwcc.......wwwwwwwwwwwwwccww
+wwwccc......wwwwwwwwwwwccwww
+wwwwwcccc...wwwwwwwwcccwwwww
+wwwwwwwwcccccccccccccwwwwwww
+ENDMAP
+
+##############################################################################
+# Shoals: fish
+#
+NAME:   Shoal_2
+PLACE:  Shoal:5
+TAGS:   water_ok
+WEIGHT: 0
+MONS:   cyclops,stone giant
+SUBST:  1 = 1.
+SUBST:  W = W:2 w
+SUBST:  . = . w:3
+KMONS:  W = giant goldfish/big fish/electric eel
+KFEAT:  W = w
+MAP
+wwwww......11......wwwww
+www.....1WWWWWW1.....www
+ww....WWWWWWWWWWWW....ww
+w..1WWWWWWWWWWWWWWWW1..w
+w..WWWWWWWWWWWWWWWWWW..w
+...WWWWWWWWWWWWWWWWWW...
+..WWWWWWWWWWWWWWWWWWWW..
+..WWWWWWWWWWWWWWWWWWWW..
+.1WWWWWWWWWWWWWWWWWWWW1.
+.WWWWWWWWWWWWWWWWWWWWWW.
+.WWWWWWWWWWWWWWWWWWWWWW.
+1WWWWWWWWWWO2WWWWWWWWWW1
+1WWWWWWWWWW22WWWWWWWWWW1
+.WWWWWWWWWWWWWWWWWWWWWW.
+.WWWWWWWWWWWWWWWWWWWWWW.
+.1WWWWWWWWWWWWWWWWWWWW1.
+..WWWWWWWWWWWWWWWWWWWW..
+..WWWWWWWWWWWWWWWWWWWW..
+w..WWWWWWWWWWWWWWWWWW..w
+w..1WWWWWWWWWWWWWWWW1..w
+ww....WWWWWWWWWWWW....ww
+www.....1WWWWWW1.....www
+wwwww......11......wwwww
+ENDMAP
+
+##############################################################################
+# Shoals: statue on rune
+#
+NAME:   Shoal_3
+PLACE:  Shoal:5
+TAGS:   water_ok
+WEIGHT: 0
+KMONS:  x : ice statue / orange crystal statue / silver statue
+KFEAT:  x : O
+MAP
+x
+ENDMAP
+
+##############################################################################
+# Shoals: swimming rune
+#
+# You may need controlled flight or apportation to get the liquid rune
+#
+NAME:   Shoal_4
+PLACE:  Shoal:5
+TAGS:   water_ok
+WEIGHT: 0
+KFEAT:  O = w
+### KITEM: O = liquid rune of Zot
+MAP
+....wwwww....
+..wwwwwww..
+.wwwwwwww.
+.wwwwwwww.
+wwwwwwwww
+wwwwwwwww
+wwwwOwwww
+wwwwwwwww
+wwwwwwwww
+.wwwwwwww.
+.wwwwwwww.
+..wwwwwww..
+....wwwww....
+ENDMAP
+
+################################################################################
+# Shoal hut with rune inside
+#
+# Shoal:$ is hand-hacked to force lots of minivaults.
+NAME:      shoalhut_rune
+TAGS:      shoal_rune water_ok
+SHUFFLE:   ABCD
+SUBST:     A:x, B:x, C:x=, D=+
+LROCKTILE:  wall_vines
+MAP
+.xxCxx.
+xx...xx
+x.....x
+B..O..D
+x.....x
+xx...xx
+.xxAxx
+ENDMAP
+
+################################################################################
+# Shoal hut with no rune inside
+#
+# Shoal:$ is hand-hacked to force lots of minivaults.
+NAME:    shoalhut_norune
+DEPTH:   Shoal:$
+TAGS:    allow_dup water_ok shoal
+SHUFFLE: ABCD
+SUBST:   A:x, B:x, C:x=, D=+
+MAP
+.xxCxx.
+xx...xx
+x.....x
+B..|..D
+x.....x
+xx...xx
+.xxAxx
+ENDMAP
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index a743dbe952..f067d84a15 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -205,9 +205,9 @@ static void _shuffle_deck(item_def &deck)
     CrawlHashTable &props = deck.props;
     ASSERT(props.exists("cards"));
 
-    CrawlVector &cards = props["cards"];
+    CrawlVector &cards = props["cards"].get_vector();
 
-    CrawlVector &flags = props["card_flags"];
+    CrawlVector &flags = props["card_flags"].get_vector();
     ASSERT(flags.size() == cards.size());
 
     // Don't use std::shuffle(), since we want to apply exactly the
@@ -243,8 +243,8 @@ static void _set_card_and_flags(item_def& deck, int idx, card_type card,
                                 unsigned char _flags)
 {
     CrawlHashTable &props = deck.props;
-    CrawlVector    &cards = props["cards"];
-    CrawlVector    &flags = props["card_flags"];
+    CrawlVector    &cards = props["cards"].get_vector();
+    CrawlVector    &flags = props["card_flags"].get_vector();
 
     if (idx == -1)
         idx = static_cast<int>(cards.size()) - 1;
@@ -783,7 +783,7 @@ bool deck_peek()
         mpr("A card falls out of the deck.");
     }
 
-    CrawlVector &cards     = deck.props["cards"];
+    CrawlVector &cards     = deck.props["cards"].get_vector();
     const int    num_cards = cards.size();
 
     card_type card1, card2;
@@ -3195,7 +3195,7 @@ static void _unmark_deck(item_def& deck)
     if (!props.exists("card_flags"))
         return;
 
-    CrawlVector &flags = props["card_flags"];
+    CrawlVector &flags = props["card_flags"].get_vector();
 
     for (unsigned int i = 0; i < flags.size(); ++i)
     {
diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 81f53d1f2c..771f97cad2 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -799,7 +799,7 @@ void handle_delay()
                  mitm[delay.parm1].name(DESC_PLAIN).c_str());
 
             // Also for bottling blood - just in case.
-            if (you.duration[DUR_PRAYER])
+            if (you.duration[DUR_PRAYER] && god_hates_butchery(you.religion))
                 did_god_conduct(DID_DEDICATED_BUTCHERY, 10);
             break;
 
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index e763b1bbd7..aff6afc172 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2106,7 +2106,7 @@ void set_feature_desc_long(const std::string &raw_name,
     if (!props.exists(LONG_DESC_KEY))
         props[LONG_DESC_KEY].new_table(SV_STR);
 
-    CrawlHashTable &desc_table = props[LONG_DESC_KEY];
+    CrawlHashTable &desc_table = props[LONG_DESC_KEY].get_table();
 
     if (desc.empty())
         desc_table.erase(raw_name);
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index f90b2f0ea6..e3d758a195 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2876,7 +2876,7 @@ void set_feature_desc_short(const std::string &base_name,
     if (!props.exists(SHORT_DESC_KEY))
         props[SHORT_DESC_KEY].new_table(SV_STR);
 
-    CrawlHashTable &desc_table = props[SHORT_DESC_KEY];
+    CrawlHashTable &desc_table = props[SHORT_DESC_KEY].get_table();
 
     if (_desc.empty())
     {
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 6c4dc207bc..975cd9b593 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -4196,7 +4196,7 @@ struct greater_second
 // out which arc the input point pos falls on.
 static int _arc_decomposition(const coord_def & pos, int n_arcs)
 {
-    float theta = atan2(pos.y, pos.x);
+    float theta = atan2((float)pos.y, (float)pos.x);
 
     if (pos.x == 0 && pos.y != 0)
         theta = pos.y > 0 ? PI / 2 : -PI / 2;
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 2e627db619..303ea417d6 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -482,7 +482,7 @@ bool is_read_safe_path(const std::string &path)
     {
         assert_read_safe_path(path);
     }
-    catch (const std::string &err)
+    catch (const std::string &)
     {
         return (false);
     }
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc
index e31cf2963b..1de1eda272 100644
--- a/crawl-ref/source/food.cc
+++ b/crawl-ref/source/food.cc
@@ -353,11 +353,9 @@ static bool _butcher_corpse(int corpse_id, bool first_corpse = true,
 {
     ASSERT(corpse_id != -1);
 
-    const bool rotten  = food_is_rotten(mitm[corpse_id]);
-    const bool can_sac = you.duration[DUR_PRAYER]
-                         && god_likes_butchery(you.religion);
+    const bool rotten = food_is_rotten(mitm[corpse_id]);
 
-    if (can_sac)
+    if (you.duration[DUR_PRAYER] && god_likes_butchery(you.religion))
     {
         if (!rotten)
         {
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index cf175bc4db..561cbeb645 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -9,16 +9,6 @@ REVISION("$Rev$");
 
 #include "initfile.h"
 
-// For finding the executable's path
-#if defined ( WIN32CONSOLE ) || defined ( WIN32TILES )
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#elif defined ( __linux__ )
-#include <unistd.h>
-#elif defined ( __MACH__ )
-extern char **NXArgv;
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
@@ -52,6 +42,16 @@ extern char **NXArgv;
 #include "items.h"
 #include "view.h"
 
+// For finding the executable's path
+#if defined ( WIN32CONSOLE ) || defined ( WIN32TILES )
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#elif defined ( __linux__ )
+#include <unistd.h>
+#elif defined ( __MACH__ )
+extern char **NXArgv;
+#endif
+
 const std::string game_options::interrupt_prefix = "interrupt_";
 game_options Options;
 
@@ -961,14 +961,21 @@ void game_options::reset_options()
 #endif
 
     // map each colour to itself as default
-#ifdef USE_8_COLOUR_TERM_MAP
-    for (int i = 0; i < 16; i++)
-        colour[i] = i % 8;
-
-    colour[ DARKGREY ] = COL_TO_REPLACE_DARKGREY;
-#else
-    for (int i = 0; i < 16; i++)
-        colour[i] = i;
+    // If USE_8_COLOUR_TERM_MAP is defined, then we force 8 colors.
+    // Otherwise, do a check to see if we're using Apple_Terminal.
+#ifndef USE_8_COLOUR_TERM_MAP
+	const char *term_program = getenv("TERM_PROGRAM");
+    if (term_program && strcmp(term_program, "Apple_Terminal") == 0) {
+#endif
+        for (int i = 0; i < 16; i++)
+            colour[i] = i % 8;
+
+        colour[ DARKGREY ] = COL_TO_REPLACE_DARKGREY;
+#ifndef USE_8_COLOUR_TERM_MAP
+	} else {
+        for (int i = 0; i < 16; i++)
+            colour[i] = i;
+	}
 #endif
 
     // map each channel to plain (well, default for now since I'm testing)
diff --git a/crawl-ref/source/libw32c.h b/crawl-ref/source/libw32c.h
index d7178b9793..58689abb15 100644
--- a/crawl-ref/source/libw32c.h
+++ b/crawl-ref/source/libw32c.h
@@ -1,6 +1,8 @@
 #ifndef LIBW32C_H
 #define LIBW32C_H
 
+#ifndef USE_TILE
+
 #include <string>
 #include <stdarg.h>
 #include <stdio.h>
@@ -58,3 +60,5 @@ inline void put_colour_ch(int colour, unsigned ch)
 }
 
 #endif
+
+#endif
diff --git a/crawl-ref/source/luadgn.cc b/crawl-ref/source/luadgn.cc
index f377397337..deb089d3f0 100644
--- a/crawl-ref/source/luadgn.cc
+++ b/crawl-ref/source/luadgn.cc
@@ -669,8 +669,8 @@ static int dgn_set_random_mon_list(lua_State *ls)
     }
     else if (nargs == 2)
     {
-        map_def **_map(
-                clua_get_userdata<map_def*>(ls, MAP_METATABLE, 1));
+        map_def **_map =
+                clua_get_userdata<map_def*>(ls, MAP_METATABLE, 1);
         map = *_map;
     }
 
@@ -3466,8 +3466,8 @@ static mons_list _lua_get_mlist(lua_State *ls, int ndx)
     }
     else
     {
-        mons_list **mlist(
-            clua_get_userdata<mons_list*>(ls, MONSLIST_METATABLE, ndx));
+        mons_list **mlist =
+            clua_get_userdata<mons_list*>(ls, MONSLIST_METATABLE, ndx);
         if (mlist)
             return (**mlist);
 
@@ -3491,8 +3491,8 @@ static item_list _lua_get_ilist(lua_State *ls, int ndx)
     }
     else
     {
-        item_list **ilist(
-            clua_get_userdata<item_list*>(ls, ITEMLIST_METATABLE, ndx));
+        item_list **ilist =
+            clua_get_userdata<item_list*>(ls, ITEMLIST_METATABLE, ndx);
         if (ilist)
             return (**ilist);
 
diff --git a/crawl-ref/source/Crawl-Info.plist b/crawl-ref/source/mac/Crawl-Info.plist
index 0becbeb1a1..4ffd139625 100644
--- a/crawl-ref/source/Crawl-Info.plist
+++ b/crawl-ref/source/mac/Crawl-Info.plist
@@ -22,5 +22,14 @@
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6.0</string>
+		<key>i386</key>
+		<string>10.4.0</string>
+		<key>ppc</key>
+		<string>10.4.0</string>
+	</dict>
 </dict>
 </plist>
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile
index 437d4a2076..450ee573c5 100644
--- a/crawl-ref/source/makefile
+++ b/crawl-ref/source/makefile
@@ -8,13 +8,42 @@
 
 GAME = crawl
 
-CC = gcc
-CXX = g++
+#
+# Compiler Flags
+#
+# The compiler flag variables are separated into their individual
+# purposes, making it easier to deal with the various tools involved
+# in a compile.
+#
+# These are also divided into global vs. local flags. So for instance,
+# CFOPTIMIZE affects Crawl, Lua, and SQLite, while CFOPTIMIZE_L only
+# affects Crawl.
+#
+# The variables are as follows:
+# CFOPTIMIZE(_L) - Optimization flags
+# CFWARN(_L) - Warning flags
+# CFOTHERS(_L) - Anything else
+#
+# These are good optimizations for a Pentium M or better:
+#CFOPTIMIZE := -O2 -march=i686 -mtune=i686 -mmmx -msse -msse2 -mfpmath=sse -funroll-all-loops
+# These are really good options for the Intel C++ compiler:
+#CFOPTIMIZE := -O3 -parallel
+CFOPTIMIZE := -O2 -funroll-all-loops
+CFOTHERS := -fno-strict-aliasing -pipe
+CFOTHERS_L := -fsigned-char
+CFWARN := -Wall
+
+#
+# The GCC and GXX variables are set later.
+#
+CC = $(GCC)
+CXX = $(GXX)
 DELETE = rm -f
 COPY = cp
 
 export CC
 export CXX
+export CFLAGS
 
 #
 # Platform Detection
@@ -47,6 +76,7 @@ GAME = crawl.exe
 endif
 
 TILES = n
+HURRY = n
 
 #
 # Set up object file dependencies for $(GAME) target.
@@ -136,58 +166,68 @@ EXTRA_DEPENDS  += $(FSQLLIBA)
 
 LIB := -L$(LUASRC) -l$(LUALIB) $(LIBDBM)
 
-INCLUDES += -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
+INCLUDES_L += -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
 
 ifeq ($(OSNAME),MacOS)
+APPLE_GCC=y
+else
+APPLE_GCC=n
+endif
+export APPLE_GCC
+
+GCC_VER=
+
+ifneq ($(APPLE_GCC),n)
 
 # Compatibility level for Mac OS X
 #
-SDK_VER=10.4
-GCC_VER=4.0
+SDK_VER := 10.4
+GCC_VER := 4.0
 
 # FIXME: The '-arch i386' is only here until
 #   SDL 1.2.14 is available
 #
-ARCHS=-arch i386
+ARCHS := -arch i386
 
 # Mac OS X 10.4 adds a 'u' on the end of the SDK name. Everything
 # else is much easier to predict the name of.
 ifeq ($(SDK_VER),10.4)
-SDKROOT=/Developer/SDKs/MacOSX$(SDK_VER)u.sdk
+SDKROOT := /Developer/SDKs/MacOSX$(SDK_VER)u.sdk
 else
-SDKROOT=/Developer/SDKs/MacOSX$(SDK_VER).sdk
-endif
-
-ifneq ($(GCC_VER),)
-GCC = gcc-$(GCC_VER)
-GCXX = g++-$(GCC_VER)
-else
-GCC = gcc
-GCXX = g++
+SDKROOT := /Developer/SDKs/MacOSX$(SDK_VER).sdk
 endif
 
 CC = $(GCC) $(ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER)
-CXX = $(GCXX) $(ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER)
+CXX = $(GXX) $(ARCHS) -isysroot $(SDKROOT) -mmacosx-version-min=$(SDK_VER)
 
 endif # MacOS
 
+ifneq ($(GCC_VER),)
+GCC := gcc-$(GCC_VER)
+GXX := g++-$(GCC_VER)
+else
+GCC := gcc
+GXX := g++
+endif
+
+RLTILES = rltiles
 
 #
 # Tiles build stuff
 #
 ifneq ($(TILES),n)
 
-RLTILES = rltiles
-
-DEFINES += -DUSE_TILE
-INCLUDES += -I$(RLTILES)
+DEFINES_L += -DUSE_TILE
+INCLUDES_L += -I$(RLTILES)
 
 ifeq ($(OSNAME),MacOS)
-
 # Handle the tile build dependencies for Mac a bit
 # differently than other platforms.
 
 LIB += -framework OpenGL -framework AppKit
+endif
+
+ifneq ($(APPLE_GCC),n)
 
 # SDL has a goof in the stock SDL_config.h which checks whether
 # __MACOSX__ is defined. It's not one of Apple's stock markers,
@@ -207,19 +247,19 @@ endif
 # headers and link to them.
 #
 ifneq ($(shell ls /Library/Frameworks/SDL.framework 2> /dev/null),)
-INCLUDES += -I/Library/Frameworks/SDL.framework/Headers
+INCLUDES_L += -I/Library/Frameworks/SDL.framework/Headers
 LIB += -framework SDL
 endif
 ifneq ($(shell ls /Library/Frameworks/SDL_image.framework 2> /dev/null),)
-INCLUDES += -I/Library/Frameworks/SDL_image.framework/Headers
+INCLUDES_L += -I/Library/Frameworks/SDL_image.framework/Headers
 LIB += -framework SDL_image
 endif
 ifneq ($(shell ls /Library/Frameworks/Freetype2.framework 2> /dev/null),)
-INCLUDES += -I/Library/Frameworks/Freetype2.framework/Headers
+INCLUDES_L += -I/Library/Frameworks/Freetype2.framework/Headers
 LIB += -framework Freetype2
 endif
 ifneq ($(shell ls /Library/Frameworks/libpng.framework 2> /dev/null),)
-INCLUDES += -I/Library/Frameworks/libpng.framework/Headers
+INCLUDES_L += -I/Library/Frameworks/libpng.framework/Headers
 LIB += -framework libpng
 endif
 
@@ -241,15 +281,15 @@ ifneq ($(shell which pkg-config 2> /dev/null),)
 
 PNG_INCLUDE := $(shell pkg-config libpng --cflags-only-I)
 PNG_CFLAGS  := $(shell pkg-config libpng --cflags-only-other)
-PNG_LDFLAGS := $(shell pkg-config libpng --libs)
+PNG_LDFLAGS := $(shell pkg-config libpng --libs-only-L) $(shell pkg-config libpng --libs-only-l)
 
 FREETYPE_INCLUDE := $(shell pkg-config freetype2 --cflags-only-I)
 FREETYPE_CFLAGS  := $(shell pkg-config freetype2 --cflags-only-other)
-FREETYPE_LDFLAGS := $(shell pkg-config freetype2 --libs)
+FREETYPE_LDFLAGS := $(shell pkg-config freetype2 --libs-only-L) $(shell pkg-config freetype2 --libs-only-l)
 
 SDL_INCLUDE := $(shell pkg-config sdl --cflags-only-I)
 SDL_CFLAGS  := $(shell pkg-config sdl --cflags-only-other)
-SDL_LDFLAGS := $(shell pkg-config sdl --libs)
+SDL_LDFLAGS := $(shell pkg-config sdl --libs-only-L) $(shell pkg-config sdl --libs-only-l)
 
 else # pkg-config
 
@@ -286,18 +326,19 @@ endif # sdl-config
 endif # pkg-config
 
 LIB += $(PNG_LDFLAGS) $(FREETYPE_LDFLAGS) $(SDL_LDFLAGS) -lSDL_image
+ifneq ($(OSNAME),MacOS)
 LIB += -lGL -lGLU
+endif
 
-DEFINES += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS)
-INCLUDES += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE)
+DEFINES_L += $(PNG_CFLAGS) $(FREETYPE_CFLAGS) $(SDL_CFLAGS)
+INCLUDES_L += $(PNG_INCLUDE) $(FREETYPE_INCLUDE) $(SDL_INCLUDE)
 
 endif # MacOS
 
 endif # TILES
 
-
-CFWARN := -Wall -Wno-parentheses -Wwrite-strings -Wshadow -pedantic
-CFOTHERS = -fno-strict-aliasing -fsigned-char $(EXTRA_FLAGS) $(DEFINES) -DCLUA_BINDINGS -pipe $(SDL_CFLAGS)
+CFWARN_L := -Wno-parentheses -Wwrite-strings -Wshadow -pedantic
+CFOTHERS_L = $(EXTERNAL_FLAGS) $(EXTRA_FLAGS) $(DEFINES) -DCLUA_BINDINGS $(SDL_CFLAGS)
 
 #
 # Figure out the build settings for this type of build
@@ -337,53 +378,58 @@ DEBUG=y
 OPTIMIZE=y
 endif
 
+ifneq ($(HURRY),n)
+OPTIMIZE=n
+endif
+
 ifeq ($(FULLDEBUG),y)
 DEFINES += -DFULLDEBUG
 endif
 ifeq ($(DEBUG),y)
 EXTRA_FLAGS += -ggdb
+DEFINES += -DDEBUG
 endif
 ifeq ($(WIZARD),y)
 DEFINES += -DWIZARD
 endif
-ifeq ($(OPTIMIZE),y)
-CFOPTIMIZE  := -O2
-else
+ifeq ($(OPTIMIZE),n)
 CFOPTIMIZE  := -O0
 endif
 ifneq ($(PCH),n)
-CFWARN += -Winvalid-pch
+CFWARN_L += -Winvalid-pch
 endif
 
 # Cygwin has a panic attack if we do this...
+ifneq ($(OPTIMIZE),n)
 ifneq ($(UNAME_S),CYGWIN)
-CFWARN += -Wuninitialized
+CFWARN_L += -Wuninitialized
 else
-CFWARN += -Wno-uninitialized
+CFWARN_L += -Wno-uninitialized
+endif
 endif
 
 ifneq ($(strip $(SAVEDIR)),)
-CFOTHERS += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
+CFOTHERS_L += '-DSAVE_DIR_PATH="$(strip $(SAVEDIR))"'
 endif
 
 ifneq ($(strip $(DATADIR)),)
-CFOTHERS += '-DDATA_DIR_PATH="$(strip $(DATADIR))"'
+CFOTHERS_L += '-DDATA_DIR_PATH="$(strip $(DATADIR))"'
 endif
 
 ifeq ($(strip $(UNICODE_GLYPHS)),y)
 # Include path for (n)curses with Unicode support.
-INCLUDES += -I/usr/include/ncursesw
+INCLUDES_L += -I/usr/include/ncursesw
 
 # Your ncurses library may include Unicode support, and you may not have a
 # separate libncursesw; in that case, change this line accordingly.
 LIBCURS  = ncursesw
-CFOTHERS += -DUNICODE_GLYPHS
+CFOTHERS_L += -DUNICODE_GLYPHS
 
 ifneq ($(strip $(UNICODE_LOCALE)),)
 ifneq ($(strip $(UNICODE_LOCALE)),.)
-CFOTHERS += -DUNICODE_LOCALE=\"$(strip $(UNICODE_LOCALE))\"
+CFOTHERS_L += -DUNICODE_LOCALE=\"$(strip $(UNICODE_LOCALE))\"
 else
-CFOTHERS += -DUNICODE_LOCALE=\"\"
+CFOTHERS_L += -DUNICODE_LOCALE=\"\"
 endif
 endif
 
@@ -394,27 +440,28 @@ endif
 
 else
 # Include path for curses or ncurses (non-Unicode).
-INCLUDES += -I/usr/include/ncurses
+INCLUDES_L += -I/usr/include/ncurses
 LIBCURS  = ncurses
 endif
 
 ifeq ($(OSNAME),WIN32)
 ifneq ($(TILES),n)
-CFOTHERS += -DWIN32TILES
+CFOTHERS_L += -DWIN32TILES
 else
-CFOTHERS += -DWIN32CONSOLE
+CFOTHERS_L += -DWIN32CONSOLE
 endif
 endif
 
 ifeq ($(OSNAME),WIN32)
-INCLUDES += -Iutil/pcre
+INCLUDES_L += -Iutil/pcre
 LIB += $(FPCRELIBA)
 else
 LIB += -l$(LIBCURS)
 endif
 
-CFLAGS  := $(CFOPTIMIZE) $(CFWARN) $(INCLUDES) $(CFOTHERS)
-YCFLAGS := $(CFOPTIMIZE) $(CFOTHERS) $(INCLUDES)
+CFLAGS   := $(CFOPTIMIZE) $(CFOTHERS) $(CFWARN)
+CFLAGS_L := $(CFOPTIMIZE_L) $(CFWARN_L) $(INCLUDES_L) $(CFOTHERS_L)
+YCFLAGS  := -w
 
 UTIL = util/
 
@@ -504,7 +551,11 @@ depend: $(DEPENDENCY_MKF)
 	$(QUIET_DEPEND)fastdep $(DEFINES) $(INCLUDES) *.h $(OBJECTS:.o=.cc) > $@
 endif
 
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),distclean)
 -include $(DEPENDENCY_MKF)
+endif
+endif
 
 ##########################################################################
 # The level compiler
@@ -518,7 +569,7 @@ prebuildyacc:	$(UTIL)levcomp.tab.cc $(UTIL)levcomp.tab.h $(UTIL)levcomp.lex.cc
 $(UTIL)levcomp.tab.cc: $(UTIL)levcomp.ypp
 		+@$(MAKE) -C $(UTIL) levcomp.tab.cc
 
-$(UTIL)levcomp.lex.cc: $(UTIL)levcomp.lpp
+$(UTIL)levcomp.lex.cc: $(UTIL)levcomp.lpp $(UTIL)levcomp.tab.cc
 		+@$(MAKE) -C $(UTIL) levcomp.lex.cc
 
 else
@@ -606,7 +657,7 @@ wizard: $(GAME)
 # test.
 
 $(UTIL)%.o: $(UTIL)%.cc
-	$(QUIET_CXX)$(CXX) $(YCFLAGS) -o $@ -c $<
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CFLAGS_L) $(YCFLAGS) -o $@ -c $<
 
 ifneq ($(PCH),n)
 %.h.gch: %.h
@@ -618,10 +669,10 @@ endif
 $(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS)
 
 %.o: %.m
-	$(QUIET_CXX)$(CC) $(CFLAGS) -c $< -o $@
+	$(QUIET_CXX)$(CC) $(CFLAGS) $(CFLAGS_L) -c $< -o $@
 
 %.o: %.cc
-	$(QUIET_CXX)$(CXX) $(CFLAGS) -c $< -o $@
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CFLAGS_L) -c $< -o $@
 
 #############################################################################
 # Build PCRE
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index dbe77740de..0d7177be5d 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -3382,9 +3382,9 @@ void set_vault_mon_list(const std::vector<mons_spec> &list)
     props[VAULT_MON_BASES_KEY].new_vector(SV_LONG).resize(size);
     props[VAULT_MON_WEIGHTS_KEY].new_vector(SV_LONG).resize(size);
 
-    CrawlVector &type_vec   = props[VAULT_MON_TYPES_KEY];
-    CrawlVector &base_vec   = props[VAULT_MON_BASES_KEY];
-    CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY];
+    CrawlVector &type_vec   = props[VAULT_MON_TYPES_KEY].get_vector();
+    CrawlVector &base_vec   = props[VAULT_MON_BASES_KEY].get_vector();
+    CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY].get_vector();
 
     for (unsigned int i = 0; i < size; i++)
     {
@@ -3422,9 +3422,9 @@ void get_vault_mon_list(std::vector<mons_spec> &list)
     ASSERT(props.exists(VAULT_MON_BASES_KEY));
     ASSERT(props.exists(VAULT_MON_WEIGHTS_KEY));
 
-    CrawlVector &type_vec   = props[VAULT_MON_TYPES_KEY];
-    CrawlVector &base_vec   = props[VAULT_MON_BASES_KEY];
-    CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY];
+    CrawlVector &type_vec   = props[VAULT_MON_TYPES_KEY].get_vector();
+    CrawlVector &base_vec   = props[VAULT_MON_BASES_KEY].get_vector();
+    CrawlVector &weight_vec = props[VAULT_MON_WEIGHTS_KEY].get_vector();
 
     ASSERT(type_vec.size() == base_vec.size());
     ASSERT(type_vec.size() == weight_vec.size());
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index c3db1f7e04..2bfd5b6a07 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1032,7 +1032,8 @@ static bool _spore_goes_pop(monsters *monster, killer_type killer,
     beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
     beam.source       = monster->pos();
     beam.target       = monster->pos();
-    beam.thrower      = (monster->attitude == ATT_FRIENDLY ? KILL_YOU : KILL_MON);
+    beam.thrower      = crawl_state.arena ? KILL_MON
+      : monster->attitude == ATT_FRIENDLY ? KILL_YOU : KILL_MON;
     beam.aux_source.clear();
 
     if (YOU_KILL(killer))
@@ -1270,6 +1271,8 @@ int monster_die(monsters *monster, killer_type killer,
 
     crawl_state.inc_mon_acting(monster);
 
+    ASSERT(!( YOU_KILL(killer) && crawl_state.arena ));
+
     mons_clear_trapping_net(monster);
 
     // Update list of monsters beholding player.
@@ -1306,10 +1309,16 @@ int monster_die(monsters *monster, killer_type killer,
     if (MON_KILL(killer) && monster_killed == killer_index)
     {
         if (monster->confused_by_you())
+        {
+            ASSERT(!crawl_state.arena);
             killer = KILL_YOU_CONF;
+        }
     }
     else if (MON_KILL(killer) && monster->has_ench(ENCH_CHARM))
+    {
+        ASSERT(!crawl_state.arena);
         killer = KILL_YOU_CONF; // Well, it was confused in a sense... (jpeg)
+    }
 
     // Take note!
     if (!mons_reset && !crawl_state.arena && MONST_INTERESTING(monster))
@@ -1465,9 +1474,6 @@ int monster_die(monsters *monster, killer_type killer,
                     mpr("That felt strangely unrewarding.");
             }
 
-            if (crawl_state.arena)
-                break;
-
             // Killing triggers tutorial lesson.
             if (gives_xp)
                 _tutorial_inspect_kill();
diff --git a/crawl-ref/source/msvc.h b/crawl-ref/source/msvc.h
index 00d26ab80a..be75c72fc8 100644
--- a/crawl-ref/source/msvc.h
+++ b/crawl-ref/source/msvc.h
@@ -4,18 +4,24 @@
  *  Written by: Paul Du Bois
  */
 
-#if defined(_MSC_VER)
+#ifndef __msvc_h
+#define __msvc_h
 
+#if defined(TARGET_COMPILER_VC)
+
+#include <io.h>
 
 #define fileno _fileno
 #define itoa _itoa
 #define snprintf _snprintf
 #define strcasecmp _stricmp
+#define strdup _strdup
 #define stricmp _stricmp
 #define strlwr _strlwr
 #define strncasecmp _strnicmp
 #define strnicmp _strnicmp
 #define unlink _unlink
+#define ftruncate _chsize
 
 // No va_copy in MSVC
 #if !defined(va_copy)
@@ -55,7 +61,8 @@ struct dirent
 DIR* opendir(const char* path);
 dirent* readdir(DIR*);
 int closedir(DIR*);
-int ftruncate(int fp, int size);
 
 
 #endif /* defined(_MSC_VER) */
+
+#endif
+\ No newline at end of file
diff --git a/crawl-ref/source/rltiles/makefile.mac b/crawl-ref/source/rltiles/makefile.mac
deleted file mode 100644
index 4f6674eafc..0000000000
--- a/crawl-ref/source/rltiles/makefile.mac
+++ /dev/null
@@ -1,40 +0,0 @@
-
-SDL_CFLAGS := -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/SDL_image.framework/Headers
-SDL_LDFLAGS := -framework SDL -framework SDL_image
-
-PNG_CFLAGS := -I/Library/Frameworks/libpng.framework/Headers
-PNG_LDFLAGS := -framework libpng
-
-CFLAGS := -F/Library/Frameworks $(SDL_CFLAGS) $(PNG_CFLAGS)
-LDFLAGS := -F/Library/Frameworks $(SDL_LDFLAGS) $(PNG_LDFLAGS)
-
-CXX = g++ -m32
-DELETE = rm -f
-
-TOOLDIR := tool
-TILEGEN := $(TOOLDIR)/tilegen.elf
-
-INPUTS := main dngn player gui
-INPUTFILES := $(INPUTS:%=dc-%.txt)
-HEADERS := $(INPUTS:%=tiledef-%.h)
-SOURCE := $(INPUTS:%=tiledef-%.cc)
-IMAGES := $(INPUTS:%=%.png)
-
-BASE_OBJECTS := tile_colour.o tile.o tile_page.o tile_list_processor.o main.o
-OBJECTS := $(BASE_OBJECTS:%=$(TOOLDIR)/%)
-
-all: $(TILEGEN) $(HEADERS) $(SOURCE) $(IMAGES)
-
-tiledef-%.h tiledef-%.cc %.png: dc-%.txt $(TILEGEN)
-	$(TILEGEN) $<
-
-clean:
-	$(DELETE) $(HEADERS) $(OBJECTS) $(TILEGEN) $(SOURCE) $(IMAGES)
-
-distclean: clean
-
-.cc.o:
-	${CXX} ${CFLAGS} -c $< -o $@
-
-$(TILEGEN): $(OBJECTS)
-	${CXX} ${LDFLAGS} $(OBJECTS) -o $@
diff --git a/crawl-ref/source/rltiles/makefile.unix b/crawl-ref/source/rltiles/makefile.unix
index 0d35c801ff..b64c673966 100644
--- a/crawl-ref/source/rltiles/makefile.unix
+++ b/crawl-ref/source/rltiles/makefile.unix
@@ -1,5 +1,12 @@
 
-ifeq ($(shell uname -s),Darwin)
+ifeq ($(OSNAME),MacOS)
+APPLE_GCC=y
+else
+APPLE_GCC=n
+endif
+
+ifneq ($(APPLE_GCC),n)
+
 SDL_CFLAGS := -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/SDL_image.framework/Headers
 SDL_LDFLAGS := -framework SDL -framework SDL_image
 
@@ -9,9 +16,6 @@ PNG_LDFLAGS := -framework libpng
 CFLAGS := -F/Library/Frameworks $(SDL_CFLAGS) $(PNG_CFLAGS)
 LDFLAGS := -F/Library/Frameworks $(SDL_LDFLAGS) $(PNG_LDFLAGS)
 
-# FIXME: We need 32-bit until SDL 1.2.14 comes out
-CXX ?= g++ -m32
-
 else
 
 SDL_CFLAGS := $(shell sdl-config --cflags)
@@ -23,10 +27,10 @@ PNG_LIB := $(shell pkg-config libpng --libs)
 CFLAGS := $(SDL_CFLAGS) $(PNG_INCLUDE)
 LDFLAGS := $(SDL_LDFLAGS) $(PNGLIB) -lSDL_image -lpng
 
-CXX ?= g++
-
 endif
 
+CXX = g++
+
 DELETE = rm -f
 
 TOOLDIR := tool
diff --git a/crawl-ref/source/rltiles/tool/tile_list_processor.cc b/crawl-ref/source/rltiles/tool/tile_list_processor.cc
index f4c4e4bc98..091d195fca 100644
--- a/crawl-ref/source/rltiles/tool/tile_list_processor.cc
+++ b/crawl-ref/source/rltiles/tool/tile_list_processor.cc
@@ -1,6 +1,7 @@
 #include "tile_list_processor.h"
 
 #include <cassert>
+#include <cctype>
 #include <iostream>
 #include <fstream>
 #include <string.h>
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 33087ddb77..0e0fd0ea5b 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -2252,7 +2252,7 @@ bool make_book_level_randart(item_def &book, int level, int num_spells,
         return (make_item_randart(book));
     }
 
-    // Being called from make_item_randart()
+    // Being called from make_item_randart().
     ASSERT(book.sub_type == BOOK_RANDART_LEVEL);
 
     // Re-read owner, if applicable.
@@ -2363,7 +2363,7 @@ bool make_book_level_randart(item_def &book, int level, int num_spells,
     props.erase(SPELL_LIST_KEY);
     props[SPELL_LIST_KEY].new_vector(SV_LONG).resize(SPELLBOOK_SIZE);
 
-    CrawlVector &spell_vec = props[SPELL_LIST_KEY];
+    CrawlVector &spell_vec = props[SPELL_LIST_KEY].get_vector();
     spell_vec.set_max_size(SPELLBOOK_SIZE);
 
     for (int i = 0; i < SPELLBOOK_SIZE; i++)
@@ -2808,7 +2808,7 @@ bool make_book_theme_randart(item_def &book, int disc1, int disc2,
     props.erase(SPELL_LIST_KEY);
     props[SPELL_LIST_KEY].new_vector(SV_LONG).resize(SPELLBOOK_SIZE);
 
-    CrawlVector &spell_vec = props[SPELL_LIST_KEY];
+    CrawlVector &spell_vec = props[SPELL_LIST_KEY].get_vector();
     spell_vec.set_max_size(SPELLBOOK_SIZE);
 
     // Count how often each spell school appears in the book.
diff --git a/crawl-ref/source/tilebuf.cc b/crawl-ref/source/tilebuf.cc
index 470e8fa549..2699502717 100644
--- a/crawl-ref/source/tilebuf.cc
+++ b/crawl-ref/source/tilebuf.cc
@@ -8,6 +8,8 @@
 #include "AppHdr.h"
 REVISION("$Rev$");
 
+#ifdef USE_TILE
+
 #include "tilebuf.h"
 #include "tilefont.h"
 #include "tilesdl.h"
@@ -323,3 +325,5 @@ void LineBuffer::add_square(float sx, float sy, float ex, float ey,
     add(ex, ey, sx, ey, col);
     add(sx, ey, sx, sy, col);
 }
+
+#endif
diff --git a/crawl-ref/source/tilefont.cc b/crawl-ref/source/tilefont.cc
index b92a499aa9..6c2c9e2d5a 100644
--- a/crawl-ref/source/tilefont.cc
+++ b/crawl-ref/source/tilefont.cc
@@ -6,6 +6,8 @@
 #include "AppHdr.h"
 REVISION("$Rev$");
 
+#ifdef USE_TILE
+
 #include "tilebuf.h"
 #include "tilefont.h"
 #include "defines.h"
@@ -759,3 +761,5 @@ void FTFont::store(FontBuffer &buf, float &x, float &y,
 
     x += m_glyphs[c].advance;
 }
+
+#endif
diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc
index 5811bdb94c..9e1c403456 100644
--- a/crawl-ref/source/tilemcache.cc
+++ b/crawl-ref/source/tilemcache.cc
@@ -1,6 +1,8 @@
 #include "AppHdr.h"
 REVISION("$Rev$");
 
+#ifdef USE_TILE
+
 #include "tilemcache.h"
 #include "tags.h"
 #include "ghost.h"
@@ -865,3 +867,5 @@ void mcache_demon::construct(writer &th)
 
     marshallDemon(th, m_demon);
 }
+
+#endif
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 3a7650eac5..819b96ae5b 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -8,6 +8,8 @@
 #include "AppHdr.h"
 REVISION("$Rev$");
 
+#ifdef USE_TILE
+
 #include "cio.h"
 #include "debug.h"
 #include "describe.h"
@@ -46,6 +48,14 @@ REVISION("$Rev$");
 #include <sys/stat.h>
 #include <SDL_opengl.h>
 
+/* These aren't defined on Win32 */
+#ifndef S_IWUSR
+#define S_IWUSR (unsigned int)-1
+#endif
+#ifndef S_IRUSR
+#define S_IRUSR (unsigned int)-1
+#endif
+
 coord_def Region::NO_CURSOR(-1, -1);
 
 int TextRegion::print_x;
@@ -4167,3 +4177,5 @@ void ImageManager::unload_textures()
     for (int i = 0; i < TEX_MAX; i++)
         m_textures[i].unload_texture();
 }
+
+#endif
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc
index 953c5ba563..7945b80124 100644
--- a/crawl-ref/source/tilesdl.cc
+++ b/crawl-ref/source/tilesdl.cc
@@ -1,6 +1,8 @@
 #include "AppHdr.h"
 REVISION("$Rev$");
 
+#ifdef USE_TILE
+
 #include "artefact.h"
 #include "cio.h"
 #include "itemname.h"
@@ -1758,3 +1760,5 @@ bool TilesFramework::need_redraw() const
 {
     return m_need_redraw;
 }
+
+#endif
diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc
index 39993ca9e0..83c76c50b2 100644
--- a/crawl-ref/source/tiletex.cc
+++ b/crawl-ref/source/tiletex.cc
@@ -1,6 +1,8 @@
 #include "AppHdr.h"
 REVISION("$Rev$");
 
+#ifdef USE_TILE
+
 #include "files.h"
 #include "tiletex.h"
 
@@ -270,3 +272,4 @@ void TilesTexture::set_info(int tile_max, tile_info_func *info_func)
     m_info_func = info_func;
 }
 
+#endif
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 4eed07c72f..fef14e202b 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -25,6 +25,7 @@ REVISION("$Rev$");
 #include "itemprop.h"
 #include "items.h"
 #include "los.h"
+#include "macro.h"
 #include "message.h"
 #include "misc.h"
 #include "mon-util.h"
diff --git a/crawl-ref/source/util/lua/src/Makefile b/crawl-ref/source/util/lua/src/Makefile
index 8460bb7f67..c67263f4f9 100644
--- a/crawl-ref/source/util/lua/src/Makefile
+++ b/crawl-ref/source/util/lua/src/Makefile
@@ -19,7 +19,7 @@ endif
 endif
 
 CC ?= gcc
-CFLAGS = -O2 -Wall $(MYCFLAGS)
+CFLAGS ?= -O2 -Wall
 AR = ar rcu
 RANLIB = ranlib
 RM = rm -f
diff --git a/crawl-ref/source/util/pcre/Makefile b/crawl-ref/source/util/pcre/Makefile
index dfc3ff341c..78602c2085 100644
--- a/crawl-ref/source/util/pcre/Makefile
+++ b/crawl-ref/source/util/pcre/Makefile
@@ -1,5 +1,13 @@
 # -*- Makefile -*- for PCRE (Win32, MinGW)
 
+ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifndef V
+        QUIET_CC       = @echo '   ' CC $@;
+        QUIET_AR       = @echo '   ' AR $@;
+        export V
+endif
+endif
+
 OBJECTS := \
 	pcre_chartables.o \
 	pcre_compile.o \
@@ -22,12 +30,12 @@ OBJECTS := \
 	pcre_version.o \
 	pcre_xclass.o
 
-CXX ?= g++
+CC ?= gcc
 AR := ar rcu
 RANLIB := ranlib
-DEL := del
+DEL := rm -f
 
-CFLAGS := -I. -DHAVE_CONFIG_H
+CFLAGS += -I. -DHAVE_CONFIG_H
 LDFLAGS :=
 
 LIBNAME := libpcre.a
@@ -39,9 +47,9 @@ clean:
 	$(DEL) $(OBJECTS)
 
 $(LIBNAME) : $(OBJECTS)
-	$(AR) $@ $?
-	$(RANLIB) $@
+	$(QUIET_AR)$(AR) $@ $?
+	@$(RANLIB) $@
 
 %.o: %.c
-	$(CXX) $(CFLAGS) -o $@ -c $<
+	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
 
diff --git a/crawl-ref/source/util/sqlite/Makefile b/crawl-ref/source/util/sqlite/Makefile
index ab7b00d8e0..4b9886a2d9 100644
--- a/crawl-ref/source/util/sqlite/Makefile
+++ b/crawl-ref/source/util/sqlite/Makefile
@@ -15,7 +15,8 @@ RANLIB = ranlib
 RM_F   = rm -f
 
 # Omit SQLite features we don't need.
-CFLAGS = -DSQLITE_OMIT_AUTHORIZATION \
+CFLAGS ?= -O2
+CFLAGS +=-DSQLITE_OMIT_AUTHORIZATION \
 		 -DSQLITE_OMIT_AUTOVACUUM \
 		 -DSQLITE_OMIT_COMPLETE \
 		 -DSQLITE_OMIT_BLOB_LITERAL \
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index 49c1e6c4ef..4610e6209d 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -3839,7 +3839,7 @@ void debug_xom_effects()
 
     fprintf(ostat, "---- STARTING XOM DEBUG TESTING ----\n");
     fprintf(ostat, "%s\n", dump_overview_screen(false).c_str());
-    fprintf(ostat, screenshot().c_str());
+    fprintf(ostat, "%s", screenshot().c_str());
     fprintf(ostat, "\n%s\n", mpr_monster_list().c_str());
     fprintf(ostat, " --> Tension: %d\n", tension);
author	Adam Borowski <kilobyte@angband.pl>	2009-10-12 23:09:22 +0200
committer	Adam Borowski <kilobyte@angband.pl>	2009-10-12 23:09:22 +0200
commit	c9af2ab4e8f209d5da546d80960ad82521a64a69 (patch)
tree	96c64ec37997f935194da911033c79d0eaa8a48e /crawl-ref/source
parent	487e80ffa4d3e30e73ae20aae57711d125492758 (diff)
parent	64b794703481fcdc61f912743b7e11bea7523d6d (diff)
download	crawl-ref-c9af2ab4e8f209d5da546d80960ad82521a64a69.tar.gz crawl-ref-c9af2ab4e8f209d5da546d80960ad82521a64a69.zip