diff --git a/GNUmakefile b/GNUmakefile
index d8afc0525..8c452c1cc 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -50,6 +50,7 @@ ifeq ($(release),1)
CC_OPTIONS = -g -O3 -DNDEBUG
CXX_OPTIONS = -g -O3 -DNDEBUG
LNK_OPTIONS = -pthread -O3
+
BUILDDIR = build/release/
else
@@ -61,32 +62,22 @@ ifeq ($(profile),1)
CC_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
CXX_OPTIONS = -s -g -ggdb -O3 -pg -DNDEBUG
LNK_OPTIONS = -pthread -ggdb -O3 -pg
+
BUILDDIR = build/profile/
-else
-ifeq ($(pedantic),1)
-################
-# pedantic build - basically a debug build with lots of warnings
-################
-
-CC_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long
-CXX_OPTIONS = -s -g -ggdb -D_DEBUG -Wall -Wextra -pedantic -ansi -Wno-long-long
-LNK_OPTIONS = -pthread -ggdb
-BUILDDIR = build/pedantic/
-
else
################
# debug build - fully traceable by gdb in C++ code, slowest
-# Since C code is used only for supporting libraries (zlib, lua), it is still O3-optimized
+# Since C code is used only for supporting libraries (zlib, lua), it is still Ofast-optimized
################
-CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3
-CXX_OPTIONS = -s -ggdb -g -D_DEBUG
-LNK_OPTIONS = -pthread -g -ggdb
+ CC_OPTIONS = -s -ggdb -g -D_DEBUG -O3
+
+CXX_OPTIONS = -s -ggdb -g -D_DEBUG -Og
+LNK_OPTIONS = -pthread -g -ggdb -Og
BUILDDIR = build/debug/
endif
endif
-endif
##################################################
# Always be warning.
@@ -100,6 +91,7 @@ ifeq ($(shell $(CXX) --version 2>&1 | grep -i -c "clang version"),0)
CC_OPTIONS += -Wno-tautological-compare
CXX_OPTIONS += -Wno-tautological-compare
disableasm = 1
+disableofast = 1
endif
@@ -150,18 +142,9 @@ endif
# INCLUDE directories for MCServer
INCLUDE = -I.\
- -Isource\
- -Isource/md5\
- -Isource/items\
- -Isource/blocks\
- -Itolua++-1.0.93/src/lib\
- -Ilua-5.1.4/src\
- -Izlib-1.2.7\
- -IiniFile\
- -Itolua++-1.0.93/include\
- -Ijsoncpp-src-0.5.0/include\
- -Ijsoncpp-src-0.5.0/src/lib_json\
- -Iexpat
+ -Isrc\
+ -Ilib\
+ -Ilib/jsoncpp/include
@@ -170,7 +153,7 @@ INCLUDE = -I.\
###################################################
# Build MCServer
-SOURCES := $(shell find CryptoPP lua-5.1.4 jsoncpp-src-0.5.0 zlib-1.2.7 source tolua++-1.0.93 iniFile expat '(' -name '*.cpp' -o -name '*.c' ')')
+SOURCES := $(shell find src lib '(' -name '*.cpp' -o -name '*.c' ')')
SOURCES := $(filter-out %minigzip.c %lua.c %tolua.c %toluabind.c %LeakFinder.cpp %StackWalker.cpp %example.c,$(SOURCES))
OBJECTS := $(patsubst %.c,$(BUILDDIR)%.o,$(SOURCES))
OBJECTS := $(patsubst %.cpp,$(BUILDDIR)%.o,$(OBJECTS))
diff --git a/VC2008/CryptoPP.cbp b/VC2008/CryptoPP.cbp
index f9f10e7a7..55b322b92 100644
--- a/VC2008/CryptoPP.cbp
+++ b/VC2008/CryptoPP.cbp
@@ -106,202 +106,202 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/VC2008/CryptoPP.vcproj b/VC2008/CryptoPP.vcproj
index 6c56d3cce..530467eeb 100644
--- a/VC2008/CryptoPP.vcproj
+++ b/VC2008/CryptoPP.vcproj
@@ -439,7 +439,7 @@
Filter=".cpp"
>
@@ -5079,19 +5079,19 @@
Name="Miscellaneous"
>
diff --git a/VC2008/GenerateBindings.cmd b/VC2008/GenerateBindings.cmd
index ac470234f..1ee0f3bf0 100644
--- a/VC2008/GenerateBindings.cmd
+++ b/VC2008/GenerateBindings.cmd
@@ -1,3 +1,3 @@
set ALLTOLUA_WAIT=N
-cd ..\source
+cd ..\src
AllToLua.bat
\ No newline at end of file
diff --git a/VC2008/JsonCpp.cbp b/VC2008/JsonCpp.cbp
index 35aa6ea81..f4826b2f1 100644
--- a/VC2008/JsonCpp.cbp
+++ b/VC2008/JsonCpp.cbp
@@ -20,10 +20,10 @@
-
+
-
+
@@ -39,10 +39,10 @@
-
+
-
+
@@ -58,20 +58,20 @@
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/VC2008/JsonCpp.vcproj b/VC2008/JsonCpp.vcproj
index 5fa1ec685..8b35f170b 100644
--- a/VC2008/JsonCpp.vcproj
+++ b/VC2008/JsonCpp.vcproj
@@ -276,31 +276,31 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
diff --git a/VC2008/Lua.cbp b/VC2008/Lua.cbp
index 208bf42f4..33353656a 100644
--- a/VC2008/Lua.cbp
+++ b/VC2008/Lua.cbp
@@ -56,123 +56,123 @@
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/VC2008/Lua.vcproj b/VC2008/Lua.vcproj
index cb063c53e..326ba6411 100644
--- a/VC2008/Lua.vcproj
+++ b/VC2008/Lua.vcproj
@@ -272,224 +272,224 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
diff --git a/VC2008/MCServer.cbp b/VC2008/MCServer.cbp
index c44a1a445..0d63e9291 100644
--- a/VC2008/MCServer.cbp
+++ b/VC2008/MCServer.cbp
@@ -23,9 +23,6 @@
-
-
-
@@ -34,9 +31,6 @@
-
-
-
@@ -60,26 +54,20 @@
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
-
+
@@ -100,26 +88,20 @@
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
-
+
@@ -130,7 +112,7 @@
-
+
@@ -191,416 +173,403 @@
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index f9acdd852..2a2ddb4ee 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";..;../expat"
+ AdditionalIncludeDirectories=""../lib/jsoncpp/include";../lib"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -121,7 +121,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";..;../expat"
+ AdditionalIncludeDirectories=""../lib/jsoncpp/include";../lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
@@ -200,7 +200,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";..;../expat"
+ AdditionalIncludeDirectories=""../lib/jsoncpp/include";../lib"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;XML_STATIC"
RuntimeLibrary="0"
UsePrecompiledHeader="2"
@@ -277,7 +277,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";..;../expat"
+ AdditionalIncludeDirectories=""../lib/jsoncpp/include";../lib"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;XML_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -359,163 +359,163 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
@@ -1204,83 +1204,87 @@
Name="Entities"
>
+
+
@@ -1288,23 +1292,23 @@
Name="UI"
>
@@ -1312,79 +1316,79 @@
Name="Simulator"
>
@@ -1392,107 +1396,107 @@
Name="OSSupport"
>
@@ -1704,7 +1708,7 @@
@@ -1715,7 +1719,7 @@
@@ -1726,7 +1730,7 @@
@@ -1736,7 +1740,7 @@
>
@@ -1848,15 +1852,15 @@
Name="External"
>
@@ -1904,43 +1908,43 @@
Name="WorldStorage"
>
@@ -1948,123 +1952,123 @@
Name="Generating"
>
@@ -2072,283 +2076,283 @@
Name="Blocks"
>
@@ -2356,123 +2360,123 @@
Name="Items"
>
@@ -2480,71 +2484,71 @@
Name="Protocol"
>
@@ -2552,7 +2556,7 @@
Name="SQLite"
>
@@ -2636,7 +2640,7 @@
Name="LuaExpat"
>
@@ -2680,87 +2684,87 @@
Name="BlockEntities"
>
@@ -2768,59 +2772,59 @@
Name="HTTPServer"
>
diff --git a/VC2008/ToLua.cbp b/VC2008/ToLua.cbp
index f22bfda4a..c7f24afcc 100644
--- a/VC2008/ToLua.cbp
+++ b/VC2008/ToLua.cbp
@@ -21,12 +21,12 @@
-
-
+
+
-
-
+
+
@@ -43,12 +43,12 @@
-
-
+
+
-
-
+
+
@@ -65,32 +65,32 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
diff --git a/VC2008/ToLua.vcproj b/VC2008/ToLua.vcproj
index dd5cfb217..24a5d8b4f 100644
--- a/VC2008/ToLua.vcproj
+++ b/VC2008/ToLua.vcproj
@@ -41,7 +41,7 @@
diff --git a/VC2008/expat.cbp b/VC2008/expat.cbp
index 6cd3f6234..6c89eff8d 100644
--- a/VC2008/expat.cbp
+++ b/VC2008/expat.cbp
@@ -40,32 +40,32 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/VC2008/expat.vcproj b/VC2008/expat.vcproj
index 148fd0cad..a02549192 100644
--- a/VC2008/expat.vcproj
+++ b/VC2008/expat.vcproj
@@ -149,75 +149,75 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
diff --git a/VC2008/zlib.cbp b/VC2008/zlib.cbp
index 2b7d759da..1d24c24ce 100644
--- a/VC2008/zlib.cbp
+++ b/VC2008/zlib.cbp
@@ -56,62 +56,62 @@
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
diff --git a/VC2008/zlib.vcproj b/VC2008/zlib.vcproj
index 6858b5610..1e07afc4c 100644
--- a/VC2008/zlib.vcproj
+++ b/VC2008/zlib.vcproj
@@ -276,107 +276,107 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
diff --git a/VC2013/.gitignore b/VC2013/.gitignore
index 9d46443bd..8e2fd484d 100644
--- a/VC2013/.gitignore
+++ b/VC2013/.gitignore
@@ -8,3 +8,4 @@ ipch/**
*.suo
*.obj
*.sdf
+*.opensdf
\ No newline at end of file
diff --git a/VC2013/CryptoPP.vcxproj b/VC2013/CryptoPP.vcxproj
index 0d7ef9774..7355ab64b 100644
--- a/VC2013/CryptoPP.vcxproj
+++ b/VC2013/CryptoPP.vcxproj
@@ -289,97 +289,97 @@
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
-
+
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
-
+
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
@@ -397,20 +397,20 @@
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
true
Disabled
true
@@ -422,20 +422,20 @@
true
true
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
true
Disabled
true
@@ -447,74 +447,74 @@
true
true
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
@@ -522,7 +522,7 @@
-
+
Disabled
@@ -540,79 +540,79 @@
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
Create
MaxSpeed
@@ -624,166 +624,166 @@
Create
Create
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
Disabled
-
-
+
+
Disabled
MaxSpeed
Disabled
Disabled
-
+
Disabled
MaxSpeed
Disabled
@@ -791,116 +791,116 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters
index 2a56447c6..793db552c 100644
--- a/VC2013/CryptoPP.vcxproj.filters
+++ b/VC2013/CryptoPP.vcxproj.filters
@@ -2,598 +2,598 @@
- {66d19353-af6a-4f52-9546-f52f44dd13cc}
+ {21031ece-70f0-4aa6-9069-6947175663ea}
.cpp
- {512ceb0e-67f5-47b1-b19b-59352a5e0785}
+ {20dd9259-32b4-4f5b-9af8-c689a12627ec}
.;.h
- {b7c7d4fa-281f-482d-be38-d8106878975c}
+ {9a225122-4fcd-43c9-868a-6caf0dd272ce}
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Header Files
-
+
Miscellaneous
-
+
Miscellaneous
-
+
Miscellaneous
-
+
Miscellaneous
diff --git a/VC2013/GenerateBindings.cmd b/VC2013/GenerateBindings.cmd
new file mode 100644
index 000000000..1ee0f3bf0
--- /dev/null
+++ b/VC2013/GenerateBindings.cmd
@@ -0,0 +1,3 @@
+set ALLTOLUA_WAIT=N
+cd ..\src
+AllToLua.bat
\ No newline at end of file
diff --git a/VC2013/JsonCpp.vcxproj b/VC2013/JsonCpp.vcxproj
index c1490d4bb..f1dd1c7b5 100644
--- a/VC2013/JsonCpp.vcxproj
+++ b/VC2013/JsonCpp.vcxproj
@@ -134,17 +134,17 @@
-
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/VC2013/JsonCpp.vcxproj.filters b/VC2013/JsonCpp.vcxproj.filters
index cf8ea5d00..b46dae3fd 100644
--- a/VC2013/JsonCpp.vcxproj.filters
+++ b/VC2013/JsonCpp.vcxproj.filters
@@ -7,29 +7,29 @@
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
diff --git a/VC2013/Lua.vcxproj b/VC2013/Lua.vcxproj
index 453ccb984..2488aa6aa 100644
--- a/VC2013/Lua.vcxproj
+++ b/VC2013/Lua.vcxproj
@@ -130,63 +130,63 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/VC2013/Lua.vcxproj.filters b/VC2013/Lua.vcxproj.filters
index 0ddb91719..21cc86850 100644
--- a/VC2013/Lua.vcxproj.filters
+++ b/VC2013/Lua.vcxproj.filters
@@ -7,126 +7,126 @@
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/VC2013/MCServer.ipgset b/VC2013/MCServer.ipgset
deleted file mode 100644
index 16f00e1ca..000000000
--- a/VC2013/MCServer.ipgset
+++ /dev/null
@@ -1,317 +0,0 @@
-
-
-
-
-
- PerformanceGuide
-
- false
- false
- false
- false
- false
-
-
-
- Introduction
-
- false
- true
- false
- false
- false
-
-
-
- GettingStarted
-
- false
- true
- true
- false
- false
-
-
-
- GetPerformanceBaseline
-
- true
- false
- false
- false
- false
-
-
-
- CheckPerfBaseline
-
- false
- false
- true
- false
- false
-
-
-
- ProfileApp
-
- false
- false
- false
- false
- false
-
-
-
- ReviewHotspots
-
- false
- false
- true
- false
- false
-
-
-
- UseIntelCompiler
-
- false
- false
- false
- false
- false
-
-
-
- SelectFilesForIntelC
-
- false
- false
- false
- false
- false
-
-
-
- GetPerformanceProgressWithIntelC
-
- false
- false
- false
- false
- false
-
-
-
- CheckPerfProgressIntelC
-
- false
- false
- true
- false
- false
-
-
-
- DetermineIntelCompilerOptions
-
- false
- false
- false
- false
- false
-
-
-
- GetPerformanceProgressWithNewOptions
-
- false
- false
- false
- false
- false
-
-
-
- CheckPerfProgressNewOptions
-
- false
- false
- true
- false
- false
-
-
-
- UseGAP
-
- false
- false
- false
- false
- false
-
-
-
- ReviewGAPAdvice
-
- false
- false
- true
- false
- false
-
-
-
- GetPerformanceProgressWithGAP
-
- false
- false
- false
- false
- false
-
-
-
- CheckPerfProgressGAP
-
- false
- false
- true
- false
- false
-
-
-
- UsePGO
-
- false
- false
- false
- false
- false
-
-
-
- CheckPerfProgressPGO
-
- false
- false
- true
- false
- false
-
-
-
- ContinueOptimizations
-
- false
- false
- false
- false
- false
-
-
-
- ParallelAmplifier
-
- false
- false
- true
- false
- false
-
-
-
- ParallelAdvisor
-
- false
- false
- true
- false
- false
-
-
-
- Summary
-
- false
- false
- false
- false
- false
-
-
-
-
- false
-
-
- false
-
- false
-
-
-
- Image Color Conversion
- true
-
-
- Symmetric Cryptography
- true
-
-
- One-Way Hash Primitives
- true
-
-
- Public Key Cryptography
- true
-
-
- Image Geometry Transforms
- true
-
-
- Image Compression
- true
-
-
- Video Coding
- true
-
-
- Computer Vision
- true
-
-
- Data Integrity
- true
-
-
- Digital Signal Processing
- true
-
-
- Speech And Telephony Encode/Decode
- true
-
-
- Data Compression
- true
-
-
- Audio Coding
- true
-
-
- true
-
- 0
-
-
- true
-
- true
-
-
\ No newline at end of file
diff --git a/VC2013/MCServer.sln b/VC2013/MCServer.sln
index d122a0d48..9dcfc802e 100644
--- a/VC2013/MCServer.sln
+++ b/VC2013/MCServer.sln
@@ -1,16 +1,8 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MCServer", "MCServer.vcxproj", "{32012054-0C96-4C43-AB27-174FF8E72D66}"
- ProjectSection(ProjectDependencies) = postProject
- {082E8185-7B3A-4945-8C82-9132341A329D} = {082E8185-7B3A-4945-8C82-9132341A329D}
- {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96} = {5FCFAF8D-FF2C-456D-A72C-1D76F913AD96}
- {3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
- {EEAB54AD-114C-4AB8-8482-0A52D502BD35} = {EEAB54AD-114C-4AB8-8482-0A52D502BD35}
- {5AAA90B9-946D-4034-83F3-676B06A6E326} = {5AAA90B9-946D-4034-83F3-676B06A6E326}
- {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}"
EndProject
diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj
index cd9f6eb4f..ecb568e9a 100644
--- a/VC2013/MCServer.vcxproj
+++ b/VC2013/MCServer.vcxproj
@@ -64,7 +64,7 @@
<_ProjectFileVersion>12.0.21005.1
- ..\MCServer\
+ Debug\
Debug\
true
@@ -83,9 +83,9 @@
- /MP /FS %(AdditionalOptions)
+ /MP %(AdditionalOptions)
Disabled
- ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)
+ ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)
false
EnableFastChecks
@@ -94,13 +94,10 @@
Globals.h
Level3
ProgramDatabase
- false
- Speed
- false
ws2_32.lib;Psapi.lib;%(AdditionalDependencies)
- $(ProjectDir)\..\MCServer\$(ProjectName).exe
+ $(ProjectDir)\..\MCServer\$(ProjectName)_debug.exe
true
Console
MachineX86
@@ -113,7 +110,7 @@
true
Speed
true
- ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)
+ ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)
MultiThreaded
Use
@@ -139,7 +136,7 @@
true
Speed
true
- ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)
+ ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)
MultiThreaded
Use
@@ -163,7 +160,7 @@
/MP %(AdditionalOptions)
Disabled
- ../zlib-1.2.7;../jsoncpp-src-0.5.0/include;../lua-5.1.4/src;../tolua++-1.0.93/include;..;../expat;%(AdditionalIncludeDirectories)
+ ../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)
false
EnableFastChecks
@@ -189,293 +186,293 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
true
true
true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -491,26 +488,26 @@
true
true
-
+
true
GenerateBindings.cmd
- cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
+ cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
Bindings.cpp;%(Outputs)
true
GenerateBindings.cmd
- cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
+ cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
Bindings.cpp;%(Outputs)
true
GenerateBindings.cmd
- cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
+ cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
Bindings.cpp;%(Outputs)
true
GenerateBindings.cmd
- cTorch.h;cStairs.h;cLadder.h;../iniFile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
+ cTorch.h;cStairs.h;cLadder.h;../lib/inifile/iniFile.h;BlockID.h;PacketID.h;Defines.h;LuaFunctions.h;cStringMap.h;cChatColor.h;cClientHandle.h;cEntity.h;cPawn.h;cPlayer.h;cPluginManager.h;cPlugin.h;cPlugin_NewLua.h;cPlugin_Lua.h;cServer.h;cWorld.h;cInventory.h;cItem.h;cWebAdmin.h;cWebPlugin.h;cWebPlugin_Lua.h;cPickup.h;cRoot.h;cTCPLink.h;Vector3f.h;Vector3d.h;Vector3i.h;Matrix4f.h;cCuboid.h;cMCLogger.h;cTracer.h;cGroup.h;BlockArea.h;packets/cPacket_Login.h;packets/cPacket_BlockDig.h;packets/cPacket_BlockPlace.h;%(AdditionalInputs)
Bindings.cpp;%(Outputs)
@@ -566,35 +563,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Create
Create
Create
Create
-
-
-
-
-
-
+
+
+
+
+
+
Level3
@@ -608,19 +605,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
MaxSpeed
true
Speed
@@ -636,13 +633,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Level3
@@ -656,78 +653,78 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
true
@@ -740,7 +737,7 @@
true
true
-
+
@@ -750,15 +747,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
@@ -772,45 +769,45 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -820,7 +817,7 @@
-
+
@@ -830,7 +827,7 @@
-
+
@@ -840,26 +837,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters
index c37f00958..1f213b900 100644
--- a/VC2013/MCServer.vcxproj.filters
+++ b/VC2013/MCServer.vcxproj.filters
@@ -10,73 +10,73 @@
cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
- {74c155c0-0f2d-4d4d-bf75-cc60408854f9}
+ {0c1dd2bf-04b0-4605-b963-b187e900b4a1}
- {0e9000fa-a1b6-4899-b0fb-66d8daa8c0e5}
+ {5c101216-8e22-4ad4-a27d-1572a4d95947}
- {a9d61705-26a1-4f89-ab9c-d73286417d25}
+ {eb7a158f-f532-4db5-9314-fca01f04a38e}
- {6f57d9e4-3758-4a17-a3a4-fd8ee5f9e398}
+ {c378fbaa-2232-4123-a58d-84f2e2e32376}
- {b58a4bc8-5be3-438d-8c21-bc56db2e66d2}
+ {be34fc66-075c-45f0-a292-e4ace73a5726}
- {6f4125b6-47ff-4de0-8294-839dab538b65}
+ {8dcfacbc-454b-4530-af61-d9db5aebb5bd}
- {6fe6ae96-c1aa-4968-b4ef-9d6f8c3f2888}
+ {3fa4b52a-1b33-4e8c-8e0c-5818dbd5de15}
- {30704df7-b1ff-4bfc-aedf-afe4afcada3f}
+ {50cbaa98-dc12-4cc9-9ba6-4e08e885c924}
- {0a54250c-fdb6-4b65-9102-20cd793a9b78}
+ {889b7953-c303-448a-8cf9-ca624011d131}
- {bea06b59-4fed-4e7f-ac87-2e9c0a1b6d27}
+ {9313323e-633a-4c87-812c-0dda81b2a509}
- {a5a43ccd-e85d-4723-9c8a-3f83c730f597}
+ {61f1ea93-c0b0-4296-81fa-808116542dc8}
- {b5f65bf0-470c-4c3c-9777-a7f3b79b8166}
+ {61efdcbf-e2d5-477f-8d67-a81c5ab3d6e6}
- {95e9878e-81c3-4b84-aa1c-d464d2a95883}
+ {86f6a355-fd04-4ba5-82b0-0fb57897da8d}
- {a67840b7-95ac-447f-9f23-d779aeaf5f49}
+ {dacfe6a2-94db-4257-8727-0f9a8c70fc8f}
- {bee4489c-556e-4eff-876e-b46b16eb33dc}
+ {b41f78d8-61f8-4476-86cf-d08080418dcb}
- {28f497b8-c75d-44e6-8e0c-8617cb56eb37}
+ {78f41ac0-8ed5-4951-8373-2aed18d9c741}
- {a9725758-b517-4602-a8e1-ffb950215db8}
+ {fc1463dd-e130-49cb-96cf-ee6755cf2de1}
- {ab501743-5b5d-449e-8ed7-bc823368a58c}
+ {a50ba11b-40c8-43ff-aa5b-aac2e4285df0}
- {baf72963-ce16-452e-80b2-a653fe04b25a}
+ {37df6f7f-93ff-4c4a-89cf-77bb6feb215f}
- {05040adb-d357-4712-b326-d8cad05f6e40}
+ {3d8e534e-8cd7-4dc5-9626-a1ce9559c118}
- {f2962218-2274-4d13-bd40-ff09c634ae1f}
+ {4419315f-3ef3-490d-ba0a-df22565b9a02}
- {ad918b66-c94a-4c54-ad79-6733424e8083}
+ {3491f495-c715-4a5b-845e-1638a4ef0127}
- {7f151cf3-a835-4e77-9c43-0a3d4bd02714}
+ {4bb6b059-2004-4795-a0e7-d401affb3063}
@@ -93,847 +93,847 @@
Resource Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Mobs
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\Entities
-
+
Source Files\UI
-
+
Source Files\UI
-
+
Source Files\UI
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\Simulator
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\OSSupport
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\Bindings
-
+
Source Files\External
-
+
Source Files\External
-
+
Source Files\WorldStorage
-
+
Source Files\WorldStorage
-
+
Source Files\WorldStorage
-
+
Source Files\WorldStorage
-
+
Source Files\WorldStorage
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Generating
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+
Source Files\Blocks
-
+