diff options
24 files changed, 253 insertions, 235 deletions
diff --git a/Tools/AnvilStats/AnvilStats.vcproj b/Tools/AnvilStats/AnvilStats.vcproj index 038f32b97..c7a2e9390 100644 --- a/Tools/AnvilStats/AnvilStats.vcproj +++ b/Tools/AnvilStats/AnvilStats.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories=""..\..\zlib-1.2.7"" + AdditionalIncludeDirectories=""..\..\lib"" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -118,7 +118,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories=""..\..\zlib-1.2.7"" + AdditionalIncludeDirectories=""..\..\lib"" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -196,7 +196,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories=""..\..\zlib-1.2.7"" + AdditionalIncludeDirectories=""..\..\lib"" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -374,27 +374,27 @@ Name="shared" > <File - RelativePath="..\..\source\OSSupport\CriticalSection.cpp" + RelativePath="..\..\src\OSSupport\CriticalSection.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\CriticalSection.h" + RelativePath="..\..\src\OSSupport\CriticalSection.h" > </File> <File - RelativePath="..\..\source\Endianness.h" + RelativePath="..\..\src\Endianness.h" > </File> <File - RelativePath="..\..\source\OSSupport\Event.cpp" + RelativePath="..\..\src\OSSupport\Event.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\Event.h" + RelativePath="..\..\src\OSSupport\Event.h" > </File> <File - RelativePath="..\..\source\WorldStorage\FastNBT.cpp" + RelativePath="..\..\src\WorldStorage\FastNBT.cpp" > <FileConfiguration Name="Debug|Win32" @@ -422,39 +422,39 @@ </FileConfiguration> </File> <File - RelativePath="..\..\source\WorldStorage\FastNBT.h" + RelativePath="..\..\src\WorldStorage\FastNBT.h" > </File> <File - RelativePath="..\..\source\OSSupport\File.cpp" + RelativePath="..\..\src\OSSupport\File.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\File.h" + RelativePath="..\..\src\OSSupport\File.h" > </File> <File - RelativePath="..\..\source\OSSupport\GZipFile.cpp" + RelativePath="..\..\src\OSSupport\GZipFile.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\GZipFile.h" + RelativePath="..\..\src\OSSupport\GZipFile.h" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.cpp" + RelativePath="..\..\src\OSSupport\IsThread.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.h" + RelativePath="..\..\src\OSSupport\IsThread.h" > </File> <File - RelativePath="..\..\source\StringUtils.cpp" + RelativePath="..\..\src\StringUtils.cpp" > </File> <File - RelativePath="..\..\source\StringUtils.h" + RelativePath="..\..\src\StringUtils.h" > </File> </Filter> diff --git a/Tools/AnvilStats/ChunkExtract.cpp b/Tools/AnvilStats/ChunkExtract.cpp index 71e804e73..96287ebef 100644 --- a/Tools/AnvilStats/ChunkExtract.cpp +++ b/Tools/AnvilStats/ChunkExtract.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "ChunkExtract.h" -#include "../../source/OSSupport/GZipFile.h" +#include "../../src/OSSupport/GZipFile.h" diff --git a/Tools/AnvilStats/Globals.h b/Tools/AnvilStats/Globals.h index 48e1f8492..c673ecb01 100644 --- a/Tools/AnvilStats/Globals.h +++ b/Tools/AnvilStats/Globals.h @@ -163,12 +163,12 @@ typedef unsigned short UInt16; // Common headers (part 1, without macros): -#include "../../source/StringUtils.h" -#include "../../source/OSSupport/CriticalSection.h" -#include "../../source/OSSupport/Semaphore.h" -#include "../../source/OSSupport/Event.h" -#include "../../source/OSSupport/IsThread.h" -#include "../../source/OSSupport/File.h" +#include "../../src/StringUtils.h" +#include "../../src/OSSupport/CriticalSection.h" +#include "../../src/OSSupport/Semaphore.h" +#include "../../src/OSSupport/Event.h" +#include "../../src/OSSupport/IsThread.h" +#include "../../src/OSSupport/File.h" @@ -221,8 +221,8 @@ public: // Common headers (part 2, with macros): -#include "../../source/ChunkDef.h" -#include "../../source/BlockID.h" +#include "../../src/ChunkDef.h" +#include "../../src/BlockID.h" diff --git a/Tools/AnvilStats/Processor.cpp b/Tools/AnvilStats/Processor.cpp index 4ecd685ad..a16f78c18 100644 --- a/Tools/AnvilStats/Processor.cpp +++ b/Tools/AnvilStats/Processor.cpp @@ -6,8 +6,8 @@ #include "Globals.h" #include "Processor.h" #include "Callback.h" -#include "../../source/WorldStorage/FastNBT.h" -#include "zlib.h" +#include "../../src/WorldStorage/FastNBT.h" +#include "zlib/zlib.h" #include "Utils.h" diff --git a/Tools/AnvilStats/Statistics.cpp b/Tools/AnvilStats/Statistics.cpp index b5b3cb176..f7519fd37 100644 --- a/Tools/AnvilStats/Statistics.cpp +++ b/Tools/AnvilStats/Statistics.cpp @@ -5,7 +5,7 @@ #include "Globals.h" #include "Statistics.h" -#include "../../source/WorldStorage/FastNBT.h" +#include "../../src/WorldStorage/FastNBT.h" diff --git a/Tools/BiomeVisualiser/BiomeCache.h b/Tools/BiomeVisualiser/BiomeCache.h index bf1503d4c..da4d6c761 100644 --- a/Tools/BiomeVisualiser/BiomeCache.h +++ b/Tools/BiomeVisualiser/BiomeCache.h @@ -17,7 +17,7 @@ While the area is being filled, requests for biomes may already come, such reque #include "BiomeSource.h" -#include "../source/OSSupport/IsThread.h" +#include "../src/OSSupport/IsThread.h" diff --git a/Tools/BiomeVisualiser/BiomeViewWnd.cpp b/Tools/BiomeVisualiser/BiomeViewWnd.cpp index 7d4db58c0..0658e3810 100644 --- a/Tools/BiomeVisualiser/BiomeViewWnd.cpp +++ b/Tools/BiomeVisualiser/BiomeViewWnd.cpp @@ -7,7 +7,7 @@ #include "BiomeViewWnd.h" #include "BiomeCache.h" #include "GeneratorBiomeSource.h" -#include "../iniFile/iniFile.h" +#include "iniFile/iniFile.h" diff --git a/Tools/BiomeVisualiser/BiomeVisualiser.vcproj b/Tools/BiomeVisualiser/BiomeVisualiser.vcproj index 2616313a2..e42870b13 100644 --- a/Tools/BiomeVisualiser/BiomeVisualiser.vcproj +++ b/Tools/BiomeVisualiser/BiomeVisualiser.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../source" + AdditionalIncludeDirectories="../../src;../../lib" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -119,7 +119,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="../../source" + AdditionalIncludeDirectories="../../src;../../lib" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -199,7 +199,7 @@ InlineFunctionExpansion="2" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="../../source" + AdditionalIncludeDirectories="../../src;../../lib" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -324,35 +324,35 @@ Name="Shared" > <File - RelativePath="..\..\source\BlockID.cpp" + RelativePath="..\..\src\BlockID.cpp" > </File> <File - RelativePath="..\..\source\BlockID.h" + RelativePath="..\..\src\BlockID.h" > </File> <File - RelativePath="..\..\source\ChunkDef.h" + RelativePath="..\..\src\ChunkDef.h" > </File> <File - RelativePath="..\..\source\Enchantments.cpp" + RelativePath="..\..\src\Enchantments.cpp" > </File> <File - RelativePath="..\..\source\Enchantments.h" + RelativePath="..\..\src\Enchantments.h" > </File> <File - RelativePath="..\..\source\WorldStorage\FastNBT.cpp" + RelativePath="..\..\src\WorldStorage\FastNBT.cpp" > </File> <File - RelativePath="..\..\source\WorldStorage\FastNBT.h" + RelativePath="..\..\src\WorldStorage\FastNBT.h" > </File> <File - RelativePath="..\..\source\Globals.cpp" + RelativePath="..\..\src\Globals.cpp" > <FileConfiguration Name="Debug|Win32" @@ -380,86 +380,94 @@ </FileConfiguration> </File> <File - RelativePath="..\..\source\Globals.h" + RelativePath="..\..\src\Globals.h" > </File> <File - RelativePath="..\..\source\Item.h" + RelativePath="..\..\src\Item.h" > </File> <File - RelativePath="..\..\source\Log.cpp" + RelativePath="..\..\src\Log.cpp" > </File> <File - RelativePath="..\..\source\Log.h" + RelativePath="..\..\src\Log.h" > </File> <File - RelativePath="..\..\source\MCLogger.cpp" + RelativePath="..\..\src\MCLogger.cpp" > </File> <File - RelativePath="..\..\source\MCLogger.h" + RelativePath="..\..\src\MCLogger.h" > </File> <File - RelativePath="..\..\source\Noise.cpp" + RelativePath="..\..\src\Noise.cpp" > </File> <File - RelativePath="..\..\source\Noise.h" + RelativePath="..\..\src\Noise.h" > </File> <File - RelativePath="..\..\source\Noise.inc" + RelativePath="..\..\src\Noise.inc" > </File> <File - RelativePath="..\..\source\StringUtils.cpp" + RelativePath="..\..\src\StringUtils.cpp" > </File> <File - RelativePath="..\..\source\StringUtils.h" + RelativePath="..\..\src\StringUtils.h" + > + </File> + <File + RelativePath="..\..\src\VoronoiMap.cpp" + > + </File> + <File + RelativePath="..\..\src\VoronoiMap.h" > </File> <Filter Name="OSSupport" > <File - RelativePath="..\..\source\OSSupport\CriticalSection.cpp" + RelativePath="..\..\src\OSSupport\CriticalSection.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\CriticalSection.h" + RelativePath="..\..\src\OSSupport\CriticalSection.h" > </File> <File - RelativePath="..\..\source\OSSupport\Event.cpp" + RelativePath="..\..\src\OSSupport\Event.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\Event.h" + RelativePath="..\..\src\OSSupport\Event.h" > </File> <File - RelativePath="..\..\source\OSSupport\File.cpp" + RelativePath="..\..\src\OSSupport\File.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\File.h" + RelativePath="..\..\src\OSSupport\File.h" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.cpp" + RelativePath="..\..\src\OSSupport\IsThread.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.h" + RelativePath="..\..\src\OSSupport\IsThread.h" > </File> <File - RelativePath="..\..\source\OSSupport\Sleep.h" + RelativePath="..\..\src\OSSupport\Sleep.h" > </File> </Filter> @@ -467,15 +475,15 @@ Name="Generating" > <File - RelativePath="..\..\source\Generating\BioGen.cpp" + RelativePath="..\..\src\Generating\BioGen.cpp" > </File> <File - RelativePath="..\..\source\Generating\BioGen.h" + RelativePath="..\..\src\Generating\BioGen.h" > </File> <File - RelativePath="..\..\source\Generating\ComposableGenerator.h" + RelativePath="..\..\src\Generating\ComposableGenerator.h" > </File> </Filter> @@ -483,11 +491,11 @@ Name="iniFile" > <File - RelativePath="..\..\iniFile\iniFile.cpp" + RelativePath="..\..\lib\iniFile\iniFile.cpp" > </File> <File - RelativePath="..\..\iniFile\iniFile.h" + RelativePath="..\..\lib\iniFile\iniFile.h" > </File> </Filter> diff --git a/Tools/BiomeVisualiser/GeneratorBiomeSource.h b/Tools/BiomeVisualiser/GeneratorBiomeSource.h index 0b47e5f93..751aed245 100644 --- a/Tools/BiomeVisualiser/GeneratorBiomeSource.h +++ b/Tools/BiomeVisualiser/GeneratorBiomeSource.h @@ -3,7 +3,7 @@ // Declares the cGeneratorBiomeSource that adapts a cBiomeGen into a cBiomeSource -#include "../source/Generating/BioGen.h" +#include "../src/Generating/BioGen.h" #include "BiomeSource.h" diff --git a/Tools/BlockZapper/.gitignore b/Tools/BlockZapper/.gitignore new file mode 100644 index 000000000..b4e15dc3c --- /dev/null +++ b/Tools/BlockZapper/.gitignore @@ -0,0 +1,3 @@ +Debug/ +logs/ +Release/ diff --git a/Tools/BlockZapper/BlockZapper.sln b/Tools/BlockZapper/BlockZapper.sln index 9a71b9311..f65451d1b 100644 --- a/Tools/BlockZapper/BlockZapper.sln +++ b/Tools/BlockZapper/BlockZapper.sln @@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlockZapper", "BlockZapper. {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} = {EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\mc-server.clean\VC2008\zlib.vcproj", "{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\VC2008\zlib.vcproj", "{EA9D50FD-937A-4EF5-8C37-5F4175AF4FEA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Tools/BlockZapper/BlockZapper.vcproj b/Tools/BlockZapper/BlockZapper.vcproj index 2a98197eb..4fa27dd31 100644 --- a/Tools/BlockZapper/BlockZapper.vcproj +++ b/Tools/BlockZapper/BlockZapper.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../source;../../zlib-1.2.7" + AdditionalIncludeDirectories="../../src;../../lib" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../../source;../../zlib-1.2.7" + AdditionalIncludeDirectories="../../src;../../lib" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -222,70 +222,62 @@ Name="shared" > <File - RelativePath="..\..\source\Log.cpp" + RelativePath="..\..\src\Log.cpp" > </File> <File - RelativePath="..\..\source\Log.h" + RelativePath="..\..\src\Log.h" > </File> <File - RelativePath="..\..\source\MCLogger.cpp" + RelativePath="..\..\src\MCLogger.cpp" > </File> <File - RelativePath="..\..\source\MCLogger.h" + RelativePath="..\..\src\MCLogger.h" > </File> <File - RelativePath="..\..\source\StringCompression.cpp" + RelativePath="..\..\src\StringCompression.cpp" > </File> <File - RelativePath="..\..\source\StringCompression.h" + RelativePath="..\..\src\StringCompression.h" > </File> <File - RelativePath="..\..\source\StringUtils.cpp" + RelativePath="..\..\src\StringUtils.cpp" > </File> <File - RelativePath="..\..\source\StringUtils.h" + RelativePath="..\..\src\StringUtils.h" > </File> <Filter Name="OSSupport" > <File - RelativePath="..\..\source\OSSupport\CriticalSection.cpp" + RelativePath="..\..\src\OSSupport\CriticalSection.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\CriticalSection.h" + RelativePath="..\..\src\OSSupport\CriticalSection.h" > </File> <File - RelativePath="..\..\source\OSSupport\File.cpp" + RelativePath="..\..\src\OSSupport\File.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\File.h" + RelativePath="..\..\src\OSSupport\File.h" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.cpp" + RelativePath="..\..\src\OSSupport\IsThread.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.h" - > - </File> - <File - RelativePath="..\..\source\OSSupport\MakeDir.cpp" - > - </File> - <File - RelativePath="..\..\source\OSSupport\MakeDir.h" + RelativePath="..\..\src\OSSupport\IsThread.h" > </File> </Filter> @@ -293,11 +285,11 @@ Name="WorldStorage" > <File - RelativePath="..\..\source\WorldStorage\FastNBT.cpp" + RelativePath="..\..\src\WorldStorage\FastNBT.cpp" > </File> <File - RelativePath="..\..\source\WorldStorage\FastNBT.h" + RelativePath="..\..\src\WorldStorage\FastNBT.h" > </File> </Filter> diff --git a/Tools/BlockZapper/GNUmakefile b/Tools/BlockZapper/GNUmakefile index edd5f9009..0ef5eb3cc 100644 --- a/Tools/BlockZapper/GNUmakefile +++ b/Tools/BlockZapper/GNUmakefile @@ -100,8 +100,8 @@ endif # INCLUDE = -I.\ - -I../../source\ - -I../../zlib-1.2.7\ + -I../../src\ + -I../../lib\ @@ -114,16 +114,16 @@ INCLUDE = -I.\ SOURCES := $(shell find . '(' -name '*.cpp' -o -name '*.c' ')') SHAREDSOURCES := \ - source/Log.cpp \ - source/MCLogger.cpp \ - source/Noise.cpp \ - source/StringCompression.cpp \ - source/StringUtils.cpp \ - source/OSSupport/CriticalSection.cpp \ - source/OSSupport/File.cpp \ - source/OSSupport/IsThread.cpp \ - source/OSSupport/MakeDir.cpp \ - source/WorldStorage/FastNBT.cpp + src/Log.cpp \ + src/MCLogger.cpp \ + src/Noise.cpp \ + src/StringCompression.cpp \ + src/StringUtils.cpp \ + src/OSSupport/CriticalSection.cpp \ + src/OSSupport/File.cpp \ + src/OSSupport/IsThread.cpp \ + src/OSSupport/MakeDir.cpp \ + src/WorldStorage/FastNBT.cpp SHAREDSOURCES := $(filter-out %minigzip.c,$(SHAREDSOURCES)) @@ -142,8 +142,6 @@ BlockZapper : $(OBJECTS) $(SHAREDOBJECTS) clean : rm -rf $(BUILDDIR) BlockZapper -install : MCServer - cp MCServer MCServer @@ -175,7 +173,7 @@ $(BUILDDIR)%.o: %.cpp @sed -e 's/.*://' -e 's/\\$$//' < $(patsubst %.o,%.d,$@).tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $(patsubst %.o,%.d,$@) @rm -f $(patsubst %.o,%.d,$@).tmp -$(BUILDDIR)source/%.o: ../../source/%.cpp +$(BUILDDIR)src/%.o: ../../src/%.cpp @mkdir -p $(dir $@) $(CC) $(CXX_OPTIONS) -c $(INCLUDE) $< -o $@ @$(CC) $(CXX_OPTIONS) -MM $(INCLUDE) $< > $(patsubst %.o,%.d,$@) diff --git a/Tools/BlockZapper/Globals.h b/Tools/BlockZapper/Globals.h index e27315ec5..3826c72fa 100644 --- a/Tools/BlockZapper/Globals.h +++ b/Tools/BlockZapper/Globals.h @@ -7,7 +7,7 @@ -#include "../../source/Globals.h" +#include "../../src/Globals.h" diff --git a/Tools/BlockZapper/Zapper.cpp b/Tools/BlockZapper/Zapper.cpp index 702f968ab..304d49770 100644 --- a/Tools/BlockZapper/Zapper.cpp +++ b/Tools/BlockZapper/Zapper.cpp @@ -7,7 +7,7 @@ #include "WorldStorage/FastNBT.h" #include "StringCompression.h" -#include "zlib.h" +#include "zlib/zlib.h" #include "Zapper.h" diff --git a/Tools/MemDumpAnalysis/.gitignore b/Tools/MemDumpAnalysis/.gitignore new file mode 100644 index 000000000..b4e15dc3c --- /dev/null +++ b/Tools/MemDumpAnalysis/.gitignore @@ -0,0 +1,3 @@ +Debug/ +logs/ +Release/ diff --git a/Tools/MemDumpAnalysis/Globals.h b/Tools/MemDumpAnalysis/Globals.h index 92d27da2c..d5fc2abfa 100644 --- a/Tools/MemDumpAnalysis/Globals.h +++ b/Tools/MemDumpAnalysis/Globals.h @@ -9,7 +9,7 @@ #pragma once -#include "../../source/Globals.h" +#include "../../src/Globals.h" /* // System headers: @@ -23,12 +23,12 @@ #include <string> // Common: -#include "../source/StringUtils.h" -#include "../source/OSSupport/File.h" +#include "../src/StringUtils.h" +#include "../src/OSSupport/File.h" */ // Libraries: -#include "../../expat/expat.h" +#include "expat/expat.h" diff --git a/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj b/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj index 345dfa962..8283fd531 100644 --- a/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj +++ b/Tools/MemDumpAnalysis/MemDumpAnalysis.vcproj @@ -41,6 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" + AdditionalIncludeDirectories="../../lib" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;COMPILED_FROM_DSP;XML_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -61,7 +62,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName)_debug.exe" + OutputFile="$(ProjectDir)\..\..\MCServer\$(ProjectName)_debug.exe" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="1" @@ -116,6 +117,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="../../lib" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;COMPILED_FROM_DSP;XML_STATIC" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -135,7 +137,7 @@ /> <Tool Name="VCLinkerTool" - OutputFile="$(ProjectDir)\..\MCServer\$(ProjectName).exe" + OutputFile="$(ProjectDir)\..\..\MCServer\$(ProjectName).exe" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="1" @@ -211,47 +213,47 @@ Name="expat" > <File - RelativePath="..\..\expat\ascii.h" + RelativePath="..\..\lib\expat\ascii.h" > </File> <File - RelativePath="..\..\expat\asciitab.h" + RelativePath="..\..\lib\expat\asciitab.h" > </File> <File - RelativePath="..\..\expat\expat.h" + RelativePath="..\..\lib\expat\expat.h" > </File> <File - RelativePath="..\..\expat\expat_external.h" + RelativePath="..\..\lib\expat\expat_external.h" > </File> <File - RelativePath="..\..\expat\iasciitab.h" + RelativePath="..\..\lib\expat\iasciitab.h" > </File> <File - RelativePath="..\..\expat\internal.h" + RelativePath="..\..\lib\expat\internal.h" > </File> <File - RelativePath="..\..\expat\latin1tab.h" + RelativePath="..\..\lib\expat\latin1tab.h" > </File> <File - RelativePath="..\..\expat\nametab.h" + RelativePath="..\..\lib\expat\nametab.h" > </File> <File - RelativePath="..\..\expat\utf8tab.h" + RelativePath="..\..\lib\expat\utf8tab.h" > </File> <File - RelativePath="..\..\expat\winconfig.h" + RelativePath="..\..\lib\expat\winconfig.h" > </File> <File - RelativePath="..\..\expat\xmlparse.c" + RelativePath="..\..\lib\expat\xmlparse.c" > <FileConfiguration Name="Debug|Win32" @@ -271,7 +273,7 @@ </FileConfiguration> </File> <File - RelativePath="..\..\expat\xmlrole.c" + RelativePath="..\..\lib\expat\xmlrole.c" > <FileConfiguration Name="Debug|Win32" @@ -291,11 +293,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\expat\xmlrole.h" + RelativePath="..\..\lib\expat\xmlrole.h" > </File> <File - RelativePath="..\..\expat\xmltok.c" + RelativePath="..\..\lib\expat\xmltok.c" > <FileConfiguration Name="Debug|Win32" @@ -315,11 +317,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\expat\xmltok.h" + RelativePath="..\..\lib\expat\xmltok.h" > </File> <File - RelativePath="..\..\expat\xmltok_impl.c" + RelativePath="..\..\lib\expat\xmltok_impl.c" > <FileConfiguration Name="Debug|Win32" @@ -339,11 +341,11 @@ </FileConfiguration> </File> <File - RelativePath="..\..\expat\xmltok_impl.h" + RelativePath="..\..\lib\expat\xmltok_impl.h" > </File> <File - RelativePath="..\..\expat\xmltok_ns.c" + RelativePath="..\..\lib\expat\xmltok_ns.c" > <FileConfiguration Name="Debug|Win32" @@ -373,62 +375,54 @@ Name="shared" > <File - RelativePath="..\..\source\Log.cpp" + RelativePath="..\..\src\Log.cpp" > </File> <File - RelativePath="..\..\source\Log.h" + RelativePath="..\..\src\Log.h" > </File> <File - RelativePath="..\..\source\MCLogger.cpp" + RelativePath="..\..\src\MCLogger.cpp" > </File> <File - RelativePath="..\..\source\MCLogger.h" + RelativePath="..\..\src\MCLogger.h" > </File> <File - RelativePath="..\..\source\StringUtils.cpp" + RelativePath="..\..\src\StringUtils.cpp" > </File> <File - RelativePath="..\..\source\StringUtils.h" + RelativePath="..\..\src\StringUtils.h" > </File> <Filter Name="OSSupport" > <File - RelativePath="..\..\source\OSSupport\CriticalSection.cpp" + RelativePath="..\..\src\OSSupport\CriticalSection.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\CriticalSection.h" + RelativePath="..\..\src\OSSupport\CriticalSection.h" > </File> <File - RelativePath="..\..\source\OSSupport\File.cpp" + RelativePath="..\..\src\OSSupport\File.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\File.h" + RelativePath="..\..\src\OSSupport\File.h" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.cpp" + RelativePath="..\..\src\OSSupport\IsThread.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.h" - > - </File> - <File - RelativePath="..\..\source\OSSupport\MakeDir.cpp" - > - </File> - <File - RelativePath="..\..\source\OSSupport\MakeDir.h" + RelativePath="..\..\src\OSSupport\IsThread.h" > </File> </Filter> diff --git a/Tools/ProtoProxy/Connection.h b/Tools/ProtoProxy/Connection.h index c2bce30fb..abb8b6cd0 100644 --- a/Tools/ProtoProxy/Connection.h +++ b/Tools/ProtoProxy/Connection.h @@ -10,7 +10,7 @@ #pragma once #include "ByteBuffer.h" -#include "../../source/OSSupport/Timer.h" +#include "OSSupport/Timer.h" diff --git a/Tools/ProtoProxy/ProtoProxy.vcproj b/Tools/ProtoProxy/ProtoProxy.vcproj index 926bbe586..0b3c77bc5 100644 --- a/Tools/ProtoProxy/ProtoProxy.vcproj +++ b/Tools/ProtoProxy/ProtoProxy.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../..;../../source" + AdditionalIncludeDirectories="../../lib;../../src" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -117,7 +117,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../..;../../source" + AdditionalIncludeDirectories="../../lib;../../src" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -225,45 +225,49 @@ Name="shared" > <File - RelativePath="..\..\source\ByteBuffer.cpp" + RelativePath="..\..\src\ByteBuffer.cpp" > </File> <File - RelativePath="..\..\source\ByteBuffer.h" + RelativePath="..\..\src\ByteBuffer.h" > </File> <File - RelativePath="..\..\source\OSSupport\CriticalSection.cpp" + RelativePath="..\..\src\StringUtils.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\CriticalSection.h" + RelativePath="..\..\src\StringUtils.h" > </File> - <File - RelativePath="..\..\source\OSSupport\IsThread.cpp" - > - </File> - <File - RelativePath="..\..\source\OSSupport\IsThread.h" - > - </File> - <File - RelativePath="..\..\source\StringUtils.cpp" - > - </File> - <File - RelativePath="..\..\source\StringUtils.h" + <Filter + Name="OSSupport" > - </File> - <File - RelativePath="..\..\source\OSSupport\Timer.cpp" - > - </File> - <File - RelativePath="..\..\source\OSSupport\Timer.h" - > - </File> + <File + RelativePath="..\..\src\OSSupport\CriticalSection.cpp" + > + </File> + <File + RelativePath="..\..\src\OSSupport\CriticalSection.h" + > + </File> + <File + RelativePath="..\..\src\OSSupport\IsThread.cpp" + > + </File> + <File + RelativePath="..\..\src\OSSupport\IsThread.h" + > + </File> + <File + RelativePath="..\..\src\OSSupport\Timer.cpp" + > + </File> + <File + RelativePath="..\..\src\OSSupport\Timer.h" + > + </File> + </Filter> </Filter> <File RelativePath=".\ProtoProxy.txt" diff --git a/Tools/RCONClient/RCONClient.vcproj b/Tools/RCONClient/RCONClient.vcproj index 59d0b3b74..82b79d2a3 100644 --- a/Tools/RCONClient/RCONClient.vcproj +++ b/Tools/RCONClient/RCONClient.vcproj @@ -41,7 +41,7 @@ <Tool Name="VCCLCompilerTool" Optimization="0" - AdditionalIncludeDirectories="../../source" + AdditionalIncludeDirectories="../../src" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -116,7 +116,7 @@ Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="../../source" + AdditionalIncludeDirectories="../../src" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -206,70 +206,70 @@ Name="shared" > <File - RelativePath="..\..\source\ByteBuffer.cpp" + RelativePath="..\..\src\ByteBuffer.cpp" > </File> <File - RelativePath="..\..\source\ByteBuffer.h" + RelativePath="..\..\src\ByteBuffer.h" > </File> <File - RelativePath="..\..\source\Log.cpp" + RelativePath="..\..\src\Log.cpp" > </File> <File - RelativePath="..\..\source\Log.h" + RelativePath="..\..\src\Log.h" > </File> <File - RelativePath="..\..\source\MCLogger.cpp" + RelativePath="..\..\src\MCLogger.cpp" > </File> <File - RelativePath="..\..\source\MCLogger.h" + RelativePath="..\..\src\MCLogger.h" > </File> <File - RelativePath="..\..\source\StringUtils.cpp" + RelativePath="..\..\src\StringUtils.cpp" > </File> <File - RelativePath="..\..\source\StringUtils.h" + RelativePath="..\..\src\StringUtils.h" > </File> <Filter Name="OSSupport" > <File - RelativePath="..\..\source\OSSupport\CriticalSection.cpp" + RelativePath="..\..\src\OSSupport\CriticalSection.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\CriticalSection.h" + RelativePath="..\..\src\OSSupport\CriticalSection.h" > </File> <File - RelativePath="..\..\source\OSSupport\File.cpp" + RelativePath="..\..\src\OSSupport\File.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\File.h" + RelativePath="..\..\src\OSSupport\File.h" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.cpp" + RelativePath="..\..\src\OSSupport\IsThread.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\IsThread.h" + RelativePath="..\..\src\OSSupport\IsThread.h" > </File> <File - RelativePath="..\..\source\OSSupport\Socket.cpp" + RelativePath="..\..\src\OSSupport\Socket.cpp" > </File> <File - RelativePath="..\..\source\OSSupport\Socket.h" + RelativePath="..\..\src\OSSupport\Socket.h" > </File> </Filter> diff --git a/VC2013/CryptoPP.vcxproj.filters b/VC2013/CryptoPP.vcxproj.filters index 793db552c..ba7db9584 100644 --- a/VC2013/CryptoPP.vcxproj.filters +++ b/VC2013/CryptoPP.vcxproj.filters @@ -2,15 +2,15 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> - <UniqueIdentifier>{21031ece-70f0-4aa6-9069-6947175663ea}</UniqueIdentifier> + <UniqueIdentifier>{a4186d1f-f2a9-4b49-b13b-a710ef40a767}</UniqueIdentifier> <Extensions>.cpp</Extensions> </Filter> <Filter Include="Header Files"> - <UniqueIdentifier>{20dd9259-32b4-4f5b-9af8-c689a12627ec}</UniqueIdentifier> + <UniqueIdentifier>{56d100a3-fe61-4f9d-b7c1-b750a9faf1b1}</UniqueIdentifier> <Extensions>.;.h</Extensions> </Filter> <Filter Include="Miscellaneous"> - <UniqueIdentifier>{9a225122-4fcd-43c9-868a-6caf0dd272ce}</UniqueIdentifier> + <UniqueIdentifier>{fd15b788-329a-459d-b675-9af86fbaa35a}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> diff --git a/VC2013/MCServer.vcxproj b/VC2013/MCServer.vcxproj index ecb568e9a..251d401c9 100644 --- a/VC2013/MCServer.vcxproj +++ b/VC2013/MCServer.vcxproj @@ -85,7 +85,7 @@ <ClCompile> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -110,7 +110,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <PrecompiledHeader>Use</PrecompiledHeader> @@ -136,7 +136,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <PrecompiledHeader>Use</PrecompiledHeader> @@ -160,7 +160,7 @@ <ClCompile> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../lib/zlib;../lib/jsoncpp/include;../lib/lua/src;../lib/tolua++/include;..;../lib/expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>../lib/jsoncpp/include;../lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>false</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> @@ -245,6 +245,7 @@ <ClInclude Include="..\src\Vector3d.h" /> <ClInclude Include="..\src\Vector3f.h" /> <ClInclude Include="..\src\Vector3i.h" /> + <ClInclude Include="..\src\VoronoiMap.h" /> <ClInclude Include="..\src\WebAdmin.h" /> <ClInclude Include="..\src\World.h" /> <ClInclude Include="..\src\Mobs\AggressiveMonster.h" /> @@ -282,6 +283,7 @@ <ClInclude Include="..\src\Mobs\ZombiePigman.h" /> <ClInclude Include="..\src\Entities\Boat.h" /> <ClInclude Include="..\src\Entities\Entity.h" /> + <ClInclude Include="..\src\Entities\ExpOrb.h" /> <ClInclude Include="..\src\Entities\FallingBlock.h" /> <ClInclude Include="..\src\Entities\Minecart.h" /> <ClInclude Include="..\src\Entities\Pawn.h" /> @@ -659,6 +661,7 @@ <ClCompile Include="..\src\Vector3d.cpp" /> <ClCompile Include="..\src\Vector3f.cpp" /> <ClCompile Include="..\src\Vector3i.cpp" /> + <ClCompile Include="..\src\VoronoiMap.cpp" /> <ClCompile Include="..\src\WebAdmin.cpp" /> <ClCompile Include="..\src\World.cpp" /> <ClCompile Include="..\src\Mobs\AggressiveMonster.cpp" /> @@ -694,6 +697,7 @@ <ClCompile Include="..\src\Mobs\ZombiePigman.cpp" /> <ClCompile Include="..\src\Entities\Boat.cpp" /> <ClCompile Include="..\src\Entities\Entity.cpp" /> + <ClCompile Include="..\src\Entities\ExpOrb.cpp" /> <ClCompile Include="..\src\Entities\FallingBlock.cpp" /> <ClCompile Include="..\src\Entities\Minecart.cpp" /> <ClCompile Include="..\src\Entities\Pawn.cpp" /> diff --git a/VC2013/MCServer.vcxproj.filters b/VC2013/MCServer.vcxproj.filters index c68637ba1..196d767dd 100644 --- a/VC2013/MCServer.vcxproj.filters +++ b/VC2013/MCServer.vcxproj.filters @@ -10,73 +10,73 @@ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> </Filter> <Filter Include="Source Files\Mobs"> - <UniqueIdentifier>{0c1dd2bf-04b0-4605-b963-b187e900b4a1}</UniqueIdentifier> + <UniqueIdentifier>{d3e4f61e-bc56-4454-8036-8a546cf8fb0b}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Entities"> - <UniqueIdentifier>{5c101216-8e22-4ad4-a27d-1572a4d95947}</UniqueIdentifier> + <UniqueIdentifier>{520ca259-2c9e-482f-9690-1768c4d29939}</UniqueIdentifier> </Filter> <Filter Include="Source Files\UI"> - <UniqueIdentifier>{eb7a158f-f532-4db5-9314-fca01f04a38e}</UniqueIdentifier> + <UniqueIdentifier>{21ab8bcf-53a0-4eec-b597-db45d6cd8635}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Simulator"> - <UniqueIdentifier>{c378fbaa-2232-4123-a58d-84f2e2e32376}</UniqueIdentifier> + <UniqueIdentifier>{73debd14-b218-4313-9389-1a0e62dae8b7}</UniqueIdentifier> </Filter> <Filter Include="Source Files\OSSupport"> - <UniqueIdentifier>{be34fc66-075c-45f0-a292-e4ace73a5726}</UniqueIdentifier> + <UniqueIdentifier>{2cbd2a0f-6204-4ed6-a825-f9e81fe86d98}</UniqueIdentifier> </Filter> <Filter Include="Source Files\OSSupport\Android Specific"> - <UniqueIdentifier>{8dcfacbc-454b-4530-af61-d9db5aebb5bd}</UniqueIdentifier> + <UniqueIdentifier>{b80f90c1-713e-4c86-ab50-78d7f5aa6c82}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Bindings"> - <UniqueIdentifier>{3fa4b52a-1b33-4e8c-8e0c-5818dbd5de15}</UniqueIdentifier> + <UniqueIdentifier>{d29f7a59-d5d7-4b06-bd73-563007f3a15a}</UniqueIdentifier> </Filter> <Filter Include="Source Files\External"> - <UniqueIdentifier>{50cbaa98-dc12-4cc9-9ba6-4e08e885c924}</UniqueIdentifier> + <UniqueIdentifier>{c8e6ce30-56d9-42b7-8a5d-0af0f1b8c5c6}</UniqueIdentifier> </Filter> <Filter Include="Source Files\WorldStorage"> - <UniqueIdentifier>{889b7953-c303-448a-8cf9-ca624011d131}</UniqueIdentifier> + <UniqueIdentifier>{0aff46f9-2a5c-4e23-8227-6c7a318efd98}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Generating"> - <UniqueIdentifier>{9313323e-633a-4c87-812c-0dda81b2a509}</UniqueIdentifier> + <UniqueIdentifier>{86cc1a62-5a4a-4b55-9919-c1944a2f17bc}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Blocks"> - <UniqueIdentifier>{61f1ea93-c0b0-4296-81fa-808116542dc8}</UniqueIdentifier> + <UniqueIdentifier>{6ae1cee3-6e6a-464e-806c-5dd353137bdd}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Items"> - <UniqueIdentifier>{61efdcbf-e2d5-477f-8d67-a81c5ab3d6e6}</UniqueIdentifier> + <UniqueIdentifier>{2e9149ad-0762-42b6-9041-e23f83934380}</UniqueIdentifier> </Filter> <Filter Include="Source Files\Protocol"> - <UniqueIdentifier>{86f6a355-fd04-4ba5-82b0-0fb57897da8d}</UniqueIdentifier> + <UniqueIdentifier>{43922b25-52e6-41e0-a534-0220c585fb64}</UniqueIdentifier> </Filter> <Filter Include="Source Files\SQLite"> - <UniqueIdentifier>{dacfe6a2-94db-4257-8727-0f9a8c70fc8f}</UniqueIdentifier> + <UniqueIdentifier>{28ba3c86-6782-4b9c-8ad1-4815a9990f56}</UniqueIdentifier> </Filter> <Filter Include="Source Files\LuaExpat"> - <UniqueIdentifier>{b41f78d8-61f8-4476-86cf-d08080418dcb}</UniqueIdentifier> + <UniqueIdentifier>{17718a17-83c9-4e37-9be9-a7974fae412c}</UniqueIdentifier> </Filter> <Filter Include="Source Files\BlockEntities"> - <UniqueIdentifier>{78f41ac0-8ed5-4951-8373-2aed18d9c741}</UniqueIdentifier> + <UniqueIdentifier>{5f9cb95f-1a51-4962-ad30-09c5e43dd9ae}</UniqueIdentifier> </Filter> <Filter Include="Source Files\HTTPServer"> - <UniqueIdentifier>{fc1463dd-e130-49cb-96cf-ee6755cf2de1}</UniqueIdentifier> + <UniqueIdentifier>{ee51cab4-2a1d-4fb2-9f33-ff5f42ee5c2c}</UniqueIdentifier> </Filter> <Filter Include="Config files"> - <UniqueIdentifier>{a50ba11b-40c8-43ff-aa5b-aac2e4285df0}</UniqueIdentifier> + <UniqueIdentifier>{a4c0514f-61e0-4a3e-90af-aa92850a6cad}</UniqueIdentifier> </Filter> <Filter Include="Plugins"> - <UniqueIdentifier>{37df6f7f-93ff-4c4a-89cf-77bb6feb215f}</UniqueIdentifier> + <UniqueIdentifier>{cdc2d187-0019-4de2-8f76-d224bbda63ee}</UniqueIdentifier> </Filter> <Filter Include="Plugins\Core"> - <UniqueIdentifier>{3d8e534e-8cd7-4dc5-9626-a1ce9559c118}</UniqueIdentifier> + <UniqueIdentifier>{9960d29d-8cdd-48a7-8f72-6abb7882e0f8}</UniqueIdentifier> </Filter> <Filter Include="Plugins\ChatLog"> - <UniqueIdentifier>{4419315f-3ef3-490d-ba0a-df22565b9a02}</UniqueIdentifier> + <UniqueIdentifier>{39ac0d09-047a-43f4-8472-d99ba62834e5}</UniqueIdentifier> </Filter> <Filter Include="Plugins\Debuggers"> - <UniqueIdentifier>{3491f495-c715-4a5b-845e-1638a4ef0127}</UniqueIdentifier> + <UniqueIdentifier>{7b6aed62-c48a-4c44-83ca-e459a16a6232}</UniqueIdentifier> </Filter> <Filter Include="Plugins\APIDump"> - <UniqueIdentifier>{4bb6b059-2004-4795-a0e7-d401affb3063}</UniqueIdentifier> + <UniqueIdentifier>{4feccf69-36aa-4881-a844-7a6f8a9e8291}</UniqueIdentifier> </Filter> </ItemGroup> <ItemGroup> @@ -270,6 +270,9 @@ <ClInclude Include="..\src\Vector3i.h"> <Filter>Source Files</Filter> </ClInclude> + <ClInclude Include="..\src\VoronoiMap.h"> + <Filter>Source Files</Filter> + </ClInclude> <ClInclude Include="..\src\WebAdmin.h"> <Filter>Source Files</Filter> </ClInclude> @@ -381,6 +384,9 @@ <ClInclude Include="..\src\Entities\Entity.h"> <Filter>Source Files\Entities</Filter> </ClInclude> + <ClInclude Include="..\src\Entities\ExpOrb.h"> + <Filter>Source Files\Entities</Filter> + </ClInclude> <ClInclude Include="..\src\Entities\FallingBlock.h"> <Filter>Source Files\Entities</Filter> </ClInclude> @@ -1246,6 +1252,9 @@ <ClCompile Include="..\src\Vector3i.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\VoronoiMap.cpp"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\src\WebAdmin.cpp"> <Filter>Source Files</Filter> </ClCompile> @@ -1351,6 +1360,9 @@ <ClCompile Include="..\src\Entities\Entity.cpp"> <Filter>Source Files\Entities</Filter> </ClCompile> + <ClCompile Include="..\src\Entities\ExpOrb.cpp"> + <Filter>Source Files\Entities</Filter> + </ClCompile> <ClCompile Include="..\src\Entities\FallingBlock.cpp"> <Filter>Source Files\Entities</Filter> </ClCompile> |