BlockArea name change reverted

fixed VS2008 building

git-svn-id: http://mc-server.googlecode.com/svn/trunk@649 0a769ca7-a7f5-676a-18bf-c427514a06d6

VC2008/MCServer.sln

@@ -7,6 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MCServer", "MCServer.vcproj
 		{082E8185-7B3A-4945-8C82-9132341A329D} = {082E8185-7B3A-4945-8C82-9132341A329D}
 		{EEAB54AD-114C-4AB8-8482-0A52D502BD35} = {EEAB54AD-114C-4AB8-8482-0A52D502BD35}
 		{5AAA90B9-946D-4034-83F3-676B06A6E326} = {5AAA90B9-946D-4034-83F3-676B06A6E326}
+		{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C} = {54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}
 		{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}
 	EndProjectSection
 EndProject
@@ -20,6 +21,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ToLua", "ToLua.vcproj", "{E
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebServer", "WebServer.vcproj", "{9A476537-42C0-4848-AB40-15CFE83D17A8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Squirrel3", "Squirrel3.vcproj", "{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -63,6 +66,12 @@ Global
 		{9A476537-42C0-4848-AB40-15CFE83D17A8}.Release profiled|Win32.Build.0 = Release profiled|Win32
 		{9A476537-42C0-4848-AB40-15CFE83D17A8}.Release|Win32.ActiveCfg = Release|Win32
 		{9A476537-42C0-4848-AB40-15CFE83D17A8}.Release|Win32.Build.0 = Release|Win32
+		{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Debug|Win32.Build.0 = Debug|Win32
+		{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release profiled|Win32.ActiveCfg = Release|Win32
+		{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release profiled|Win32.Build.0 = Release|Win32
+		{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release|Win32.ActiveCfg = Release|Win32
+		{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

VC2008/MCServer.vcproj

@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include"
+				AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";../squirrel_3_0_1_stable/include;../squirrel_3_0_1_stable;../squirrel_3_0_1_stable/sqrat"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -117,7 +117,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include"
+				AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";../squirrel_3_0_1_stable/include;../squirrel_3_0_1_stable;../squirrel_3_0_1_stable/sqrat"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -192,7 +192,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include"
+				AdditionalIncludeDirectories=""../zlib-1.2.7";"../jsoncpp-src-0.5.0/include";"../lua-5.1.4/src";"../tolua++-1.0.93/include";../squirrel_3_0_1_stable/include;../squirrel_3_0_1_stable;../squirrel_3_0_1_stable/sqrat"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -1621,7 +1621,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="GenerateBindings.cmd"
+							CommandLine="GenerateBindings.cmd&#x0D;&#x0A;"
 							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
 							Outputs="Bindings.cpp"
 						/>
@@ -1632,7 +1632,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="GenerateBindings.cmd"
+							CommandLine="GenerateBindings.cmd&#x0D;&#x0A;"
 							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
 							Outputs="Bindings.cpp"
 						/>
@@ -1643,7 +1643,7 @@
 						>
 						<Tool
 							Name="VCCustomBuildTool"
-							CommandLine="GenerateBindings.cmd"
+							CommandLine="GenerateBindings.cmd&#x0D;&#x0A;"
 							AdditionalDependencies="&quot;cTorch.h&quot;;&quot;cStairs.h&quot;;&quot;cLadder.h&quot;;&quot;../iniFile/iniFile.h&quot;;&quot;BlockID.h&quot;;&quot;PacketID.h&quot;;&quot;Defines.h&quot;;&quot;LuaFunctions.h&quot;;&quot;cStringMap.h&quot;;&quot;cChatColor.h&quot;;&quot;cClientHandle.h&quot;;&quot;cEntity.h&quot;;&quot;cPawn.h&quot;;&quot;cPlayer.h&quot;;&quot;cPluginManager.h&quot;;&quot;cPlugin.h&quot;;&quot;cPlugin_NewLua.h&quot;;&quot;cPlugin_Lua.h&quot;;&quot;cServer.h&quot;;&quot;cWorld.h&quot;;&quot;cInventory.h&quot;;&quot;cItem.h&quot;;&quot;cWebAdmin.h&quot;;&quot;cWebPlugin.h&quot;;&quot;cWebPlugin_Lua.h&quot;;&quot;cPickup.h&quot;;&quot;cRoot.h&quot;;&quot;cTCPLink.h&quot;;&quot;Vector3f.h&quot;;&quot;Vector3d.h&quot;;&quot;Vector3i.h&quot;;&quot;Matrix4f.h&quot;;&quot;cCuboid.h&quot;;&quot;cMCLogger.h&quot;;&quot;cTracer.h&quot;;&quot;cGroup.h&quot;;&quot;BlockArea.h&quot;;&quot;packets/cPacket_Login.h&quot;;&quot;packets/cPacket_BlockDig.h&quot;;&quot;packets/cPacket_BlockPlace.h&quot;"
 							Outputs="Bindings.cpp"
 						/>
@@ -1721,6 +1721,14 @@
 					RelativePath="..\source\cPlugin_NewLua.h"
 					>
 				</File>
+				<File
+					RelativePath="..\source\cPlugin_Squirrel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\source\cPlugin_Squirrel.h"
+					>
+				</File>
 				<File
 					RelativePath="..\source\cPluginManager.cpp"
 					>
@@ -1761,14 +1769,6 @@
 					RelativePath="..\source\ManualBindings.h"
 					>
 				</File>
-				<File
-					RelativePath="..\source\SquirrelBindings.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\source\SquirrelBindings.h"
-					>
-				</File>
 				<File
 					RelativePath="..\source\tolua++.h"
 					>
@@ -1777,6 +1777,34 @@
 					RelativePath="..\source\tolua_base.h"
 					>
 				</File>
+				<Filter
+					Name="Squirrel"
+					>
+					<File
+						RelativePath="..\source\squirrelbindings\cSquirrelBaseClass.h"
+						>
+					</File>
+					<File
+						RelativePath="..\source\squirrelbindings\SquirrelBindings.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\source\squirrelbindings\SquirrelBindings.h"
+						>
+					</File>
+					<File
+						RelativePath="..\source\squirrelbindings\SquirrelFunctions.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\source\squirrelbindings\SquirrelFunctions.h"
+						>
+					</File>
+					<File
+						RelativePath="..\source\squirrelbindings\SquirrelObject.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="External"

VC2008/Squirrel3.vcproj

@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="Squirrel3"
+	ProjectGUID="{54DBF6CE-D1A8-4CCB-A249-4BF1CA9B7E4C}"
+	RootNamespace="Squirrel3"
+	Keyword="ManagedCProj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\squirrel_3_0_1_stable\include"
+				PreprocessorDefinitions="WIN32;_DEBUG"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				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>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				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>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="sqstdlib"
+			>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdaux.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdblob.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdblobimpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdio.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdmath.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdrex.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdstream.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdstream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdstring.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\sqstdlib\sqstdsystem.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="squirrel"
+			>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqapi.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqarray.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqbaselib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqclass.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqclass.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqclosure.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqcompiler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqcompiler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqdebug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqfuncproto.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqfuncstate.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqfuncstate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqlexer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqlexer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqmem.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqobject.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqobject.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqopcodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqpcheader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqstate.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqstate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqstring.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqtable.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqtable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\squserdata.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\squtils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqvm.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\squirrel_3_0_1_stable\squirrel\sqvm.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

VC2010/MCServer.vcxproj

@@ -303,10 +303,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\source\BioGen.cpp" />
+    <ClCompile Include="..\source\BlockArea.cpp" />
     <ClCompile Include="..\source\BlockID.cpp" />
     <ClCompile Include="..\source\cAggressiveMonster.cpp" />
     <ClCompile Include="..\Source\cAuthenticator.cpp" />
-    <ClCompile Include="..\source\cBlockArea.cpp" />
     <ClCompile Include="..\source\cBlockingTCPLink.cpp" />
     <ClCompile Include="..\source\cCavespider.cpp" />
     <ClCompile Include="..\Source\cChicken.cpp" />
@@ -495,10 +495,10 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\source\BioGen.h" />
+    <ClInclude Include="..\source\BlockArea.h" />
     <ClInclude Include="..\Source\BlockID.h" />
     <ClInclude Include="..\source\cAggressiveMonster.h" />
     <ClInclude Include="..\Source\cAuthenticator.h" />
-    <ClInclude Include="..\source\cBlockArea.h" />
     <ClInclude Include="..\source\cBlockingTCPLink.h" />
     <ClInclude Include="..\source\cCavespider.h" />
     <ClInclude Include="..\Source\cChicken.h" />

VC2010/MCServer.vcxproj.filters

@@ -904,7 +904,6 @@
       <Filter>Storage</Filter>
     </ClCompile>
     <ClCompile Include="..\source\CraftingRecipes.cpp" />
-    <ClCompile Include="..\source\cBlockArea.cpp" />
     <ClCompile Include="..\source\squirrelbindings\SquirrelBindings.cpp">
       <Filter>LuaBindings\SquirrelBindings</Filter>
     </ClCompile>
@@ -914,6 +913,7 @@
     <ClCompile Include="..\source\squirrelbindings\SquirrelFunctions.cpp">
       <Filter>LuaBindings\SquirrelBindings</Filter>
     </ClCompile>
+    <ClCompile Include="..\source\BlockArea.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\source\cServer.h">
@@ -1421,7 +1421,6 @@
     </ClInclude>
     <ClInclude Include="..\source\cStep.h" />
     <ClInclude Include="..\source\CraftingRecipes.h" />
-    <ClInclude Include="..\source\cBlockArea.h" />
     <ClInclude Include="..\source\squirrelbindings\SquirrelBindings.h">
       <Filter>LuaBindings\SquirrelBindings</Filter>
     </ClInclude>
@@ -1437,6 +1436,7 @@
     <ClInclude Include="..\source\squirrelbindings\cSquirrelBaseClass.h">
       <Filter>LuaBindings\SquirrelBindings</Filter>
     </ClInclude>
+    <ClInclude Include="..\source\BlockArea.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\source\AllToLua.pkg">

makefile_base

@@ -69,7 +69,7 @@ MCServer : \
 		build/cReferenceManager.o\
 		build/Bindings.o\
 		build/BlockID.o\
-		build/cBlockArea.o\
+		build/BlockArea.o\
 		build/cBlockToPickup.o\
 		build/cChatColor.o\
 		build/cChestEntity.o\
@@ -317,7 +317,7 @@ MCServer : \
 		build/cReferenceManager.o\
 		build/Bindings.o\
 		build/BlockID.o\
-		build/cBlockArea.o\
+		build/BlockArea.o\
 		build/cBlockToPickup.o\
 		build/cChatColor.o\
 		build/cChestEntity.o\
@@ -810,8 +810,8 @@ build/Bindings.o : source/Bindings.cpp
 build/BlockID.o : source/BlockID.cpp
 	$(CC) $(CC_OPTIONS) source/BlockID.cpp -c $(INCLUDE) -o build/BlockID.o
 
-build/cBlockArea.o : source/cBlockArea.cpp
+build/BlockArea.o : source/BlockArea.cpp
-	$(CC) $(CC_OPTIONS) source/cBlockArea.cpp -c $(INCLUDE) -o build/cBlockArea.o
+	$(CC) $(CC_OPTIONS) source/BlockArea.cpp -c $(INCLUDE) -o build/BlockArea.o
 
 
 # Item # 6 -- cBlockToPickup --

source/AllToLua.pkg

@@ -45,7 +45,7 @@ $cfile "cCuboid.h"
 $cfile "cMCLogger.h"
 $cfile "cTracer.h"
 $cfile "cGroup.h"
-$cfile "cBlockArea.h"
+$cfile "BlockArea.h"
 $cfile "packets/cPacket_Login.h"
 $cfile "packets/cPacket_BlockDig.h"
 $cfile "packets/cPacket_BlockPlace.h"

source/Bindings.cpp

@@ -54,7 +54,7 @@ TOLUA_API int  tolua_AllToLua_open (lua_State* tolua_S);
 #include "cMCLogger.h"
 #include "cTracer.h"
 #include "cGroup.h"
-#include "cBlockArea.h"
+#include "BlockArea.h"
 #include "packets/cPacket_Login.h"
 #include "packets/cPacket_BlockDig.h"
 #include "packets/cPacket_BlockPlace.h"

source/BlockArea.cpp

@@ -5,7 +5,7 @@
 // The object also supports writing the blockdata back into cWorld, even into other coords
 
 #include "Globals.h"
-#include "cBlockArea.h"
+#include "BlockArea.h"
 #include "cWorld.h"
 
 

source/cChunk.cpp

@@ -27,7 +27,7 @@
 #include "cBlockToPickup.h"
 #include "MersenneTwister.h"
 #include "cPlayer.h"
-#include "cBlockArea.h"
+#include "BlockArea.h"
 #include "cPluginManager.h"
 
 #include "packets/cPacket_DestroyEntity.h"

source/squirrelbindings/cSquirrelBaseClass.h

@@ -2,7 +2,7 @@
 #include "SquirrelBindings.h"
 #include "../cPlugin_Squirrel.h"
 #include "../cPluginManager.h"
-#include "cRoot.h"
+#include "../cRoot.h"
 
 //The baseclass for squirrel plugins
 class cSquirrelBaseClass