diff --git a/VC2008/MCServer.sln b/VC2008/MCServer.sln
index 6cafa6558..0bce96238 100644
--- a/VC2008/MCServer.sln
+++ b/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
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 8c47ec37e..420bf2f5a 100644
--- a/VC2008/MCServer.vcproj
+++ b/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 @@
>
@@ -1632,7 +1632,7 @@
>
@@ -1643,7 +1643,7 @@
>
@@ -1721,6 +1721,14 @@
RelativePath="..\source\cPlugin_NewLua.h"
>
+
+
+
+
@@ -1761,14 +1769,6 @@
RelativePath="..\source\ManualBindings.h"
>
-
-
-
-
@@ -1777,6 +1777,34 @@
RelativePath="..\source\tolua_base.h"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index a75974183..06fc9aa6e 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -303,10 +303,10 @@
+
-
@@ -495,10 +495,10 @@
+
-
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index 1793d9b49..1e1dc15d9 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -904,7 +904,6 @@
Storage
-
LuaBindings\SquirrelBindings
@@ -914,6 +913,7 @@
LuaBindings\SquirrelBindings
+
@@ -1421,7 +1421,6 @@
-
LuaBindings\SquirrelBindings
@@ -1437,6 +1436,7 @@
LuaBindings\SquirrelBindings
+
diff --git a/makefile_base b/makefile_base
index 5560256da..71828e411 100644
--- a/makefile_base
+++ b/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
- $(CC) $(CC_OPTIONS) source/cBlockArea.cpp -c $(INCLUDE) -o build/cBlockArea.o
+build/BlockArea.o : source/BlockArea.cpp
+ $(CC) $(CC_OPTIONS) source/BlockArea.cpp -c $(INCLUDE) -o build/BlockArea.o
# Item # 6 -- cBlockToPickup --
diff --git a/source/AllToLua.pkg b/source/AllToLua.pkg
index 4e4cfb4b5..b6ee64579 100644
--- a/source/AllToLua.pkg
+++ b/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"
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index 772013b25..cabd19661 100644
--- a/source/Bindings.cpp
+++ b/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"
diff --git a/source/cBlockArea.cpp b/source/BlockArea.cpp
similarity index 95%
rename from source/cBlockArea.cpp
rename to source/BlockArea.cpp
index 810503f04..7750b94fb 100644
--- a/source/cBlockArea.cpp
+++ b/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"
diff --git a/source/cBlockArea.h b/source/BlockArea.h
similarity index 100%
rename from source/cBlockArea.h
rename to source/BlockArea.h
diff --git a/source/cChunk.cpp b/source/cChunk.cpp
index 489af5cc9..cd94e3413 100644
--- a/source/cChunk.cpp
+++ b/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"
diff --git a/source/squirrelbindings/cSquirrelBaseClass.h b/source/squirrelbindings/cSquirrelBaseClass.h
index e06301555..a66ca7ddd 100644
--- a/source/squirrelbindings/cSquirrelBaseClass.h
+++ b/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