From 42af6df5d88413a72beb45e5a04bad099c64e66b Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 24 Sep 2019 22:35:11 +0200 Subject: [PATCH] Rename ZoneLoader and ZoneWriter components to ZoneLoading and ZoneWriting to make a difference between the executive class and the component class --- OpenAssetTools.sln | 4 ++-- src/ZoneLoader/ZoneLoader.cpp | 1 - src/ZoneLoader/ZoneLoader.h | 8 -------- .../Game/T6/ContentLoaderT6.cpp | 0 src/{ZoneLoader => ZoneLoading}/Game/T6/ContentLoaderT6.h | 0 .../Game/T6/XAssets/rawfile/rawfile_load_db.cpp | 0 .../Game/T6/XAssets/rawfile/rawfile_load_db.h | 0 .../Game/T6/ZoneLoaderFactoryT6.cpp | 0 .../Game/T6/ZoneLoaderFactoryT6.h | 0 src/{ZoneLoader => ZoneLoading}/Loading/AssetLoader.cpp | 0 src/{ZoneLoader => ZoneLoading}/Loading/AssetLoader.h | 0 src/{ZoneLoader => ZoneLoading}/Loading/ContentLoader.cpp | 0 src/{ZoneLoader => ZoneLoading}/Loading/ContentLoader.h | 0 .../Loading/Exception/BlockOverflowException.cpp | 0 .../Loading/Exception/BlockOverflowException.h | 0 .../Loading/Exception/InvalidChunkSizeException.cpp | 0 .../Loading/Exception/InvalidChunkSizeException.h | 0 .../Loading/Exception/InvalidCompressionException.cpp | 0 .../Loading/Exception/InvalidCompressionException.h | 0 .../Loading/Exception/InvalidFileNameException.cpp | 0 .../Loading/Exception/InvalidFileNameException.h | 0 .../Loading/Exception/InvalidMagicException.cpp | 0 .../Loading/Exception/InvalidMagicException.h | 0 .../Loading/Exception/InvalidOffsetBlockException.cpp | 0 .../Loading/Exception/InvalidOffsetBlockException.h | 0 .../Exception/InvalidOffsetBlockOffsetException.cpp | 0 .../Loading/Exception/InvalidOffsetBlockOffsetException.h | 0 .../Loading/Exception/InvalidSignatureException.cpp | 0 .../Loading/Exception/InvalidSignatureException.h | 0 .../Loading/Exception/InvalidVersionException.cpp | 0 .../Loading/Exception/InvalidVersionException.h | 0 .../Loading/Exception/InvalidXBlockSizeException.cpp | 0 .../Loading/Exception/InvalidXBlockSizeException.h | 0 .../Loading/Exception/LoadingException.h | 0 .../Loading/Exception/UnexpectedEndOfFileException.cpp | 0 .../Loading/Exception/UnexpectedEndOfFileException.h | 0 .../Loading/Exception/UnsupportedAssetTypeException.cpp | 0 .../Loading/Exception/UnsupportedAssetTypeException.h | 0 .../Loading/IContentLoadingEntryPoint.h | 0 src/{ZoneLoader => ZoneLoading}/Loading/ILoadingStep.h | 0 src/{ZoneLoader => ZoneLoading}/Loading/ILoadingStream.h | 0 .../Loading/ISignatureDataProvider.h | 0 .../Loading/ISignatureProvider.h | 0 .../Loading/IZoneLoaderFactory.h | 0 .../Loading/IZoneScriptStringProvider.h | 0 .../Loading/LoadingFileStream.cpp | 0 .../Loading/LoadingFileStream.h | 0 .../Loading/Processor/ProcessorInflate.cpp | 0 .../Loading/Processor/ProcessorInflate.h | 0 .../Loading/Processor/ProcessorStreamCipher.cpp | 0 .../Loading/Processor/ProcessorStreamCipher.h | 0 .../Loading/Processor/ProcessorXChunks.cpp | 0 .../Loading/Processor/ProcessorXChunks.h | 0 .../Loading/Processor/XChunks/ChunkProcessorInflate.cpp | 0 .../Loading/Processor/XChunks/ChunkProcessorInflate.h | 0 .../Loading/Processor/XChunks/ChunkProcessorSalsa20.cpp | 0 .../Loading/Processor/XChunks/ChunkProcessorSalsa20.h | 0 .../Loading/Processor/XChunks/IXChunkProcessor.h | 0 .../Loading/Steps/StepAddProcessor.cpp | 0 .../Loading/Steps/StepAddProcessor.h | 0 .../Loading/Steps/StepAllocXBlocks.cpp | 0 .../Loading/Steps/StepAllocXBlocks.h | 0 .../Loading/Steps/StepLoadSignature.cpp | 0 .../Loading/Steps/StepLoadSignature.h | 0 .../Loading/Steps/StepLoadZoneContent.cpp | 0 .../Loading/Steps/StepLoadZoneContent.h | 0 .../Loading/Steps/StepSkipBytes.cpp | 0 .../Loading/Steps/StepSkipBytes.h | 0 .../Loading/Steps/StepVerifyFileName.cpp | 0 .../Loading/Steps/StepVerifyFileName.h | 0 .../Loading/Steps/StepVerifyMagic.cpp | 0 .../Loading/Steps/StepVerifyMagic.h | 0 .../Loading/Steps/StepVerifySignature.cpp | 0 .../Loading/Steps/StepVerifySignature.h | 0 .../Loading/StreamProcessor.cpp | 0 src/{ZoneLoader => ZoneLoading}/Loading/StreamProcessor.h | 0 src/{ZoneLoader => ZoneLoading}/Loading/ZoneLoader.cpp | 0 src/{ZoneLoader => ZoneLoading}/Loading/ZoneLoader.h | 0 .../Zone/Stream/IZoneInputStream.h | 0 .../Zone/Stream/Impl/XBlockInputStream.cpp | 0 .../Zone/Stream/Impl/XBlockInputStream.h | 0 src/ZoneLoading/ZoneLoading.cpp | 6 ++++++ src/ZoneLoading/ZoneLoading.h | 8 ++++++++ .../ZoneLoading.vcxproj} | 5 ++++- .../Zone/Stream/IZoneOutputStream.h | 0 .../ZoneWriting.vcxproj} | 3 ++- 86 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 src/ZoneLoader/ZoneLoader.cpp delete mode 100644 src/ZoneLoader/ZoneLoader.h rename src/{ZoneLoader => ZoneLoading}/Game/T6/ContentLoaderT6.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Game/T6/ContentLoaderT6.h (100%) rename src/{ZoneLoader => ZoneLoading}/Game/T6/XAssets/rawfile/rawfile_load_db.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Game/T6/XAssets/rawfile/rawfile_load_db.h (100%) rename src/{ZoneLoader => ZoneLoading}/Game/T6/ZoneLoaderFactoryT6.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Game/T6/ZoneLoaderFactoryT6.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/AssetLoader.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/AssetLoader.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ContentLoader.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ContentLoader.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/BlockOverflowException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/BlockOverflowException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidChunkSizeException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidChunkSizeException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidCompressionException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidCompressionException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidFileNameException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidFileNameException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidMagicException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidMagicException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidOffsetBlockException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidOffsetBlockException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidOffsetBlockOffsetException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidOffsetBlockOffsetException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidSignatureException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidSignatureException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidVersionException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidVersionException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidXBlockSizeException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/InvalidXBlockSizeException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/LoadingException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/UnexpectedEndOfFileException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/UnexpectedEndOfFileException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/UnsupportedAssetTypeException.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Exception/UnsupportedAssetTypeException.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/IContentLoadingEntryPoint.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ILoadingStep.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ILoadingStream.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ISignatureDataProvider.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ISignatureProvider.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/IZoneLoaderFactory.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/IZoneScriptStringProvider.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/LoadingFileStream.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/LoadingFileStream.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/ProcessorInflate.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/ProcessorInflate.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/ProcessorStreamCipher.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/ProcessorStreamCipher.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/ProcessorXChunks.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/ProcessorXChunks.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/XChunks/ChunkProcessorInflate.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/XChunks/ChunkProcessorInflate.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/XChunks/ChunkProcessorSalsa20.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/XChunks/ChunkProcessorSalsa20.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Processor/XChunks/IXChunkProcessor.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepAddProcessor.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepAddProcessor.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepAllocXBlocks.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepAllocXBlocks.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepLoadSignature.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepLoadSignature.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepLoadZoneContent.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepLoadZoneContent.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepSkipBytes.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepSkipBytes.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepVerifyFileName.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepVerifyFileName.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepVerifyMagic.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepVerifyMagic.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepVerifySignature.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/Steps/StepVerifySignature.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/StreamProcessor.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/StreamProcessor.h (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ZoneLoader.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Loading/ZoneLoader.h (100%) rename src/{ZoneLoader => ZoneLoading}/Zone/Stream/IZoneInputStream.h (100%) rename src/{ZoneLoader => ZoneLoading}/Zone/Stream/Impl/XBlockInputStream.cpp (100%) rename src/{ZoneLoader => ZoneLoading}/Zone/Stream/Impl/XBlockInputStream.h (100%) create mode 100644 src/ZoneLoading/ZoneLoading.cpp create mode 100644 src/ZoneLoading/ZoneLoading.h rename src/{ZoneLoader/ZoneLoader.vcxproj => ZoneLoading/ZoneLoading.vcxproj} (98%) rename src/{ZoneWriter => ZoneWriting}/Zone/Stream/IZoneOutputStream.h (100%) rename src/{ZoneWriter/ZoneWriter.vcxproj => ZoneWriting/ZoneWriting.vcxproj} (98%) diff --git a/OpenAssetTools.sln b/OpenAssetTools.sln index 8e621d8f..1168b6ee 100644 --- a/OpenAssetTools.sln +++ b/OpenAssetTools.sln @@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoneCommon", "src\ZoneCommon\ZoneCommon.vcxproj", "{2A92076F-6DFD-4FB1-9E6A-4542B4B049C7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoneLoader", "src\ZoneLoader\ZoneLoader.vcxproj", "{C3308B0A-D7C7-4560-B5F7-3654DD4B668D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoneLoading", "src\ZoneLoading\ZoneLoading.vcxproj", "{C3308B0A-D7C7-4560-B5F7-3654DD4B668D}" ProjectSection(ProjectDependencies) = postProject {FC57DC08-3496-4DCF-B52F-6EDC568B333C} = {FC57DC08-3496-4DCF-B52F-6EDC568B333C} {757FB12A-B410-4B76-B525-2D11A14DAD9D} = {757FB12A-B410-4B76-B525-2D11A14DAD9D} @@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoneLoader", "src\ZoneLoade {8D511FF0-0294-47EE-9AC4-BD9FE5DCC681} = {8D511FF0-0294-47EE-9AC4-BD9FE5DCC681} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoneWriter", "src\ZoneWriter\ZoneWriter.vcxproj", "{B92A6638-68F9-45D2-AB03-6ED69E349381}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoneWriting", "src\ZoneWriting\ZoneWriting.vcxproj", "{B92A6638-68F9-45D2-AB03-6ED69E349381}" ProjectSection(ProjectDependencies) = postProject {D1C20C32-9CB8-44B8-9DF7-F0CF8FB304D3} = {D1C20C32-9CB8-44B8-9DF7-F0CF8FB304D3} {2A92076F-6DFD-4FB1-9E6A-4542B4B049C7} = {2A92076F-6DFD-4FB1-9E6A-4542B4B049C7} diff --git a/src/ZoneLoader/ZoneLoader.cpp b/src/ZoneLoader/ZoneLoader.cpp deleted file mode 100644 index 5993061f..00000000 --- a/src/ZoneLoader/ZoneLoader.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "ZoneLoader.h" \ No newline at end of file diff --git a/src/ZoneLoader/ZoneLoader.h b/src/ZoneLoader/ZoneLoader.h deleted file mode 100644 index 30ced04b..00000000 --- a/src/ZoneLoader/ZoneLoader.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -#include - -class ZoneLoader -{ -public: - static bool LoadZone(std::string& name); -}; diff --git a/src/ZoneLoader/Game/T6/ContentLoaderT6.cpp b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp similarity index 100% rename from src/ZoneLoader/Game/T6/ContentLoaderT6.cpp rename to src/ZoneLoading/Game/T6/ContentLoaderT6.cpp diff --git a/src/ZoneLoader/Game/T6/ContentLoaderT6.h b/src/ZoneLoading/Game/T6/ContentLoaderT6.h similarity index 100% rename from src/ZoneLoader/Game/T6/ContentLoaderT6.h rename to src/ZoneLoading/Game/T6/ContentLoaderT6.h diff --git a/src/ZoneLoader/Game/T6/XAssets/rawfile/rawfile_load_db.cpp b/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db.cpp similarity index 100% rename from src/ZoneLoader/Game/T6/XAssets/rawfile/rawfile_load_db.cpp rename to src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db.cpp diff --git a/src/ZoneLoader/Game/T6/XAssets/rawfile/rawfile_load_db.h b/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db.h similarity index 100% rename from src/ZoneLoader/Game/T6/XAssets/rawfile/rawfile_load_db.h rename to src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db.h diff --git a/src/ZoneLoader/Game/T6/ZoneLoaderFactoryT6.cpp b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp similarity index 100% rename from src/ZoneLoader/Game/T6/ZoneLoaderFactoryT6.cpp rename to src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.cpp diff --git a/src/ZoneLoader/Game/T6/ZoneLoaderFactoryT6.h b/src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.h similarity index 100% rename from src/ZoneLoader/Game/T6/ZoneLoaderFactoryT6.h rename to src/ZoneLoading/Game/T6/ZoneLoaderFactoryT6.h diff --git a/src/ZoneLoader/Loading/AssetLoader.cpp b/src/ZoneLoading/Loading/AssetLoader.cpp similarity index 100% rename from src/ZoneLoader/Loading/AssetLoader.cpp rename to src/ZoneLoading/Loading/AssetLoader.cpp diff --git a/src/ZoneLoader/Loading/AssetLoader.h b/src/ZoneLoading/Loading/AssetLoader.h similarity index 100% rename from src/ZoneLoader/Loading/AssetLoader.h rename to src/ZoneLoading/Loading/AssetLoader.h diff --git a/src/ZoneLoader/Loading/ContentLoader.cpp b/src/ZoneLoading/Loading/ContentLoader.cpp similarity index 100% rename from src/ZoneLoader/Loading/ContentLoader.cpp rename to src/ZoneLoading/Loading/ContentLoader.cpp diff --git a/src/ZoneLoader/Loading/ContentLoader.h b/src/ZoneLoading/Loading/ContentLoader.h similarity index 100% rename from src/ZoneLoader/Loading/ContentLoader.h rename to src/ZoneLoading/Loading/ContentLoader.h diff --git a/src/ZoneLoader/Loading/Exception/BlockOverflowException.cpp b/src/ZoneLoading/Loading/Exception/BlockOverflowException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/BlockOverflowException.cpp rename to src/ZoneLoading/Loading/Exception/BlockOverflowException.cpp diff --git a/src/ZoneLoader/Loading/Exception/BlockOverflowException.h b/src/ZoneLoading/Loading/Exception/BlockOverflowException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/BlockOverflowException.h rename to src/ZoneLoading/Loading/Exception/BlockOverflowException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidChunkSizeException.cpp b/src/ZoneLoading/Loading/Exception/InvalidChunkSizeException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidChunkSizeException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidChunkSizeException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidChunkSizeException.h b/src/ZoneLoading/Loading/Exception/InvalidChunkSizeException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidChunkSizeException.h rename to src/ZoneLoading/Loading/Exception/InvalidChunkSizeException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidCompressionException.cpp b/src/ZoneLoading/Loading/Exception/InvalidCompressionException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidCompressionException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidCompressionException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidCompressionException.h b/src/ZoneLoading/Loading/Exception/InvalidCompressionException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidCompressionException.h rename to src/ZoneLoading/Loading/Exception/InvalidCompressionException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidFileNameException.cpp b/src/ZoneLoading/Loading/Exception/InvalidFileNameException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidFileNameException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidFileNameException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidFileNameException.h b/src/ZoneLoading/Loading/Exception/InvalidFileNameException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidFileNameException.h rename to src/ZoneLoading/Loading/Exception/InvalidFileNameException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidMagicException.cpp b/src/ZoneLoading/Loading/Exception/InvalidMagicException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidMagicException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidMagicException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidMagicException.h b/src/ZoneLoading/Loading/Exception/InvalidMagicException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidMagicException.h rename to src/ZoneLoading/Loading/Exception/InvalidMagicException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidOffsetBlockException.cpp b/src/ZoneLoading/Loading/Exception/InvalidOffsetBlockException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidOffsetBlockException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidOffsetBlockException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidOffsetBlockException.h b/src/ZoneLoading/Loading/Exception/InvalidOffsetBlockException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidOffsetBlockException.h rename to src/ZoneLoading/Loading/Exception/InvalidOffsetBlockException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidOffsetBlockOffsetException.cpp b/src/ZoneLoading/Loading/Exception/InvalidOffsetBlockOffsetException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidOffsetBlockOffsetException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidOffsetBlockOffsetException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidOffsetBlockOffsetException.h b/src/ZoneLoading/Loading/Exception/InvalidOffsetBlockOffsetException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidOffsetBlockOffsetException.h rename to src/ZoneLoading/Loading/Exception/InvalidOffsetBlockOffsetException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidSignatureException.cpp b/src/ZoneLoading/Loading/Exception/InvalidSignatureException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidSignatureException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidSignatureException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidSignatureException.h b/src/ZoneLoading/Loading/Exception/InvalidSignatureException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidSignatureException.h rename to src/ZoneLoading/Loading/Exception/InvalidSignatureException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidVersionException.cpp b/src/ZoneLoading/Loading/Exception/InvalidVersionException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidVersionException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidVersionException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidVersionException.h b/src/ZoneLoading/Loading/Exception/InvalidVersionException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidVersionException.h rename to src/ZoneLoading/Loading/Exception/InvalidVersionException.h diff --git a/src/ZoneLoader/Loading/Exception/InvalidXBlockSizeException.cpp b/src/ZoneLoading/Loading/Exception/InvalidXBlockSizeException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidXBlockSizeException.cpp rename to src/ZoneLoading/Loading/Exception/InvalidXBlockSizeException.cpp diff --git a/src/ZoneLoader/Loading/Exception/InvalidXBlockSizeException.h b/src/ZoneLoading/Loading/Exception/InvalidXBlockSizeException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/InvalidXBlockSizeException.h rename to src/ZoneLoading/Loading/Exception/InvalidXBlockSizeException.h diff --git a/src/ZoneLoader/Loading/Exception/LoadingException.h b/src/ZoneLoading/Loading/Exception/LoadingException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/LoadingException.h rename to src/ZoneLoading/Loading/Exception/LoadingException.h diff --git a/src/ZoneLoader/Loading/Exception/UnexpectedEndOfFileException.cpp b/src/ZoneLoading/Loading/Exception/UnexpectedEndOfFileException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/UnexpectedEndOfFileException.cpp rename to src/ZoneLoading/Loading/Exception/UnexpectedEndOfFileException.cpp diff --git a/src/ZoneLoader/Loading/Exception/UnexpectedEndOfFileException.h b/src/ZoneLoading/Loading/Exception/UnexpectedEndOfFileException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/UnexpectedEndOfFileException.h rename to src/ZoneLoading/Loading/Exception/UnexpectedEndOfFileException.h diff --git a/src/ZoneLoader/Loading/Exception/UnsupportedAssetTypeException.cpp b/src/ZoneLoading/Loading/Exception/UnsupportedAssetTypeException.cpp similarity index 100% rename from src/ZoneLoader/Loading/Exception/UnsupportedAssetTypeException.cpp rename to src/ZoneLoading/Loading/Exception/UnsupportedAssetTypeException.cpp diff --git a/src/ZoneLoader/Loading/Exception/UnsupportedAssetTypeException.h b/src/ZoneLoading/Loading/Exception/UnsupportedAssetTypeException.h similarity index 100% rename from src/ZoneLoader/Loading/Exception/UnsupportedAssetTypeException.h rename to src/ZoneLoading/Loading/Exception/UnsupportedAssetTypeException.h diff --git a/src/ZoneLoader/Loading/IContentLoadingEntryPoint.h b/src/ZoneLoading/Loading/IContentLoadingEntryPoint.h similarity index 100% rename from src/ZoneLoader/Loading/IContentLoadingEntryPoint.h rename to src/ZoneLoading/Loading/IContentLoadingEntryPoint.h diff --git a/src/ZoneLoader/Loading/ILoadingStep.h b/src/ZoneLoading/Loading/ILoadingStep.h similarity index 100% rename from src/ZoneLoader/Loading/ILoadingStep.h rename to src/ZoneLoading/Loading/ILoadingStep.h diff --git a/src/ZoneLoader/Loading/ILoadingStream.h b/src/ZoneLoading/Loading/ILoadingStream.h similarity index 100% rename from src/ZoneLoader/Loading/ILoadingStream.h rename to src/ZoneLoading/Loading/ILoadingStream.h diff --git a/src/ZoneLoader/Loading/ISignatureDataProvider.h b/src/ZoneLoading/Loading/ISignatureDataProvider.h similarity index 100% rename from src/ZoneLoader/Loading/ISignatureDataProvider.h rename to src/ZoneLoading/Loading/ISignatureDataProvider.h diff --git a/src/ZoneLoader/Loading/ISignatureProvider.h b/src/ZoneLoading/Loading/ISignatureProvider.h similarity index 100% rename from src/ZoneLoader/Loading/ISignatureProvider.h rename to src/ZoneLoading/Loading/ISignatureProvider.h diff --git a/src/ZoneLoader/Loading/IZoneLoaderFactory.h b/src/ZoneLoading/Loading/IZoneLoaderFactory.h similarity index 100% rename from src/ZoneLoader/Loading/IZoneLoaderFactory.h rename to src/ZoneLoading/Loading/IZoneLoaderFactory.h diff --git a/src/ZoneLoader/Loading/IZoneScriptStringProvider.h b/src/ZoneLoading/Loading/IZoneScriptStringProvider.h similarity index 100% rename from src/ZoneLoader/Loading/IZoneScriptStringProvider.h rename to src/ZoneLoading/Loading/IZoneScriptStringProvider.h diff --git a/src/ZoneLoader/Loading/LoadingFileStream.cpp b/src/ZoneLoading/Loading/LoadingFileStream.cpp similarity index 100% rename from src/ZoneLoader/Loading/LoadingFileStream.cpp rename to src/ZoneLoading/Loading/LoadingFileStream.cpp diff --git a/src/ZoneLoader/Loading/LoadingFileStream.h b/src/ZoneLoading/Loading/LoadingFileStream.h similarity index 100% rename from src/ZoneLoader/Loading/LoadingFileStream.h rename to src/ZoneLoading/Loading/LoadingFileStream.h diff --git a/src/ZoneLoader/Loading/Processor/ProcessorInflate.cpp b/src/ZoneLoading/Loading/Processor/ProcessorInflate.cpp similarity index 100% rename from src/ZoneLoader/Loading/Processor/ProcessorInflate.cpp rename to src/ZoneLoading/Loading/Processor/ProcessorInflate.cpp diff --git a/src/ZoneLoader/Loading/Processor/ProcessorInflate.h b/src/ZoneLoading/Loading/Processor/ProcessorInflate.h similarity index 100% rename from src/ZoneLoader/Loading/Processor/ProcessorInflate.h rename to src/ZoneLoading/Loading/Processor/ProcessorInflate.h diff --git a/src/ZoneLoader/Loading/Processor/ProcessorStreamCipher.cpp b/src/ZoneLoading/Loading/Processor/ProcessorStreamCipher.cpp similarity index 100% rename from src/ZoneLoader/Loading/Processor/ProcessorStreamCipher.cpp rename to src/ZoneLoading/Loading/Processor/ProcessorStreamCipher.cpp diff --git a/src/ZoneLoader/Loading/Processor/ProcessorStreamCipher.h b/src/ZoneLoading/Loading/Processor/ProcessorStreamCipher.h similarity index 100% rename from src/ZoneLoader/Loading/Processor/ProcessorStreamCipher.h rename to src/ZoneLoading/Loading/Processor/ProcessorStreamCipher.h diff --git a/src/ZoneLoader/Loading/Processor/ProcessorXChunks.cpp b/src/ZoneLoading/Loading/Processor/ProcessorXChunks.cpp similarity index 100% rename from src/ZoneLoader/Loading/Processor/ProcessorXChunks.cpp rename to src/ZoneLoading/Loading/Processor/ProcessorXChunks.cpp diff --git a/src/ZoneLoader/Loading/Processor/ProcessorXChunks.h b/src/ZoneLoading/Loading/Processor/ProcessorXChunks.h similarity index 100% rename from src/ZoneLoader/Loading/Processor/ProcessorXChunks.h rename to src/ZoneLoading/Loading/Processor/ProcessorXChunks.h diff --git a/src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorInflate.cpp b/src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorInflate.cpp similarity index 100% rename from src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorInflate.cpp rename to src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorInflate.cpp diff --git a/src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorInflate.h b/src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorInflate.h similarity index 100% rename from src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorInflate.h rename to src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorInflate.h diff --git a/src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorSalsa20.cpp b/src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorSalsa20.cpp similarity index 100% rename from src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorSalsa20.cpp rename to src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorSalsa20.cpp diff --git a/src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorSalsa20.h b/src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorSalsa20.h similarity index 100% rename from src/ZoneLoader/Loading/Processor/XChunks/ChunkProcessorSalsa20.h rename to src/ZoneLoading/Loading/Processor/XChunks/ChunkProcessorSalsa20.h diff --git a/src/ZoneLoader/Loading/Processor/XChunks/IXChunkProcessor.h b/src/ZoneLoading/Loading/Processor/XChunks/IXChunkProcessor.h similarity index 100% rename from src/ZoneLoader/Loading/Processor/XChunks/IXChunkProcessor.h rename to src/ZoneLoading/Loading/Processor/XChunks/IXChunkProcessor.h diff --git a/src/ZoneLoader/Loading/Steps/StepAddProcessor.cpp b/src/ZoneLoading/Loading/Steps/StepAddProcessor.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepAddProcessor.cpp rename to src/ZoneLoading/Loading/Steps/StepAddProcessor.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepAddProcessor.h b/src/ZoneLoading/Loading/Steps/StepAddProcessor.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepAddProcessor.h rename to src/ZoneLoading/Loading/Steps/StepAddProcessor.h diff --git a/src/ZoneLoader/Loading/Steps/StepAllocXBlocks.cpp b/src/ZoneLoading/Loading/Steps/StepAllocXBlocks.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepAllocXBlocks.cpp rename to src/ZoneLoading/Loading/Steps/StepAllocXBlocks.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepAllocXBlocks.h b/src/ZoneLoading/Loading/Steps/StepAllocXBlocks.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepAllocXBlocks.h rename to src/ZoneLoading/Loading/Steps/StepAllocXBlocks.h diff --git a/src/ZoneLoader/Loading/Steps/StepLoadSignature.cpp b/src/ZoneLoading/Loading/Steps/StepLoadSignature.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepLoadSignature.cpp rename to src/ZoneLoading/Loading/Steps/StepLoadSignature.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepLoadSignature.h b/src/ZoneLoading/Loading/Steps/StepLoadSignature.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepLoadSignature.h rename to src/ZoneLoading/Loading/Steps/StepLoadSignature.h diff --git a/src/ZoneLoader/Loading/Steps/StepLoadZoneContent.cpp b/src/ZoneLoading/Loading/Steps/StepLoadZoneContent.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepLoadZoneContent.cpp rename to src/ZoneLoading/Loading/Steps/StepLoadZoneContent.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepLoadZoneContent.h b/src/ZoneLoading/Loading/Steps/StepLoadZoneContent.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepLoadZoneContent.h rename to src/ZoneLoading/Loading/Steps/StepLoadZoneContent.h diff --git a/src/ZoneLoader/Loading/Steps/StepSkipBytes.cpp b/src/ZoneLoading/Loading/Steps/StepSkipBytes.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepSkipBytes.cpp rename to src/ZoneLoading/Loading/Steps/StepSkipBytes.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepSkipBytes.h b/src/ZoneLoading/Loading/Steps/StepSkipBytes.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepSkipBytes.h rename to src/ZoneLoading/Loading/Steps/StepSkipBytes.h diff --git a/src/ZoneLoader/Loading/Steps/StepVerifyFileName.cpp b/src/ZoneLoading/Loading/Steps/StepVerifyFileName.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepVerifyFileName.cpp rename to src/ZoneLoading/Loading/Steps/StepVerifyFileName.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepVerifyFileName.h b/src/ZoneLoading/Loading/Steps/StepVerifyFileName.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepVerifyFileName.h rename to src/ZoneLoading/Loading/Steps/StepVerifyFileName.h diff --git a/src/ZoneLoader/Loading/Steps/StepVerifyMagic.cpp b/src/ZoneLoading/Loading/Steps/StepVerifyMagic.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepVerifyMagic.cpp rename to src/ZoneLoading/Loading/Steps/StepVerifyMagic.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepVerifyMagic.h b/src/ZoneLoading/Loading/Steps/StepVerifyMagic.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepVerifyMagic.h rename to src/ZoneLoading/Loading/Steps/StepVerifyMagic.h diff --git a/src/ZoneLoader/Loading/Steps/StepVerifySignature.cpp b/src/ZoneLoading/Loading/Steps/StepVerifySignature.cpp similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepVerifySignature.cpp rename to src/ZoneLoading/Loading/Steps/StepVerifySignature.cpp diff --git a/src/ZoneLoader/Loading/Steps/StepVerifySignature.h b/src/ZoneLoading/Loading/Steps/StepVerifySignature.h similarity index 100% rename from src/ZoneLoader/Loading/Steps/StepVerifySignature.h rename to src/ZoneLoading/Loading/Steps/StepVerifySignature.h diff --git a/src/ZoneLoader/Loading/StreamProcessor.cpp b/src/ZoneLoading/Loading/StreamProcessor.cpp similarity index 100% rename from src/ZoneLoader/Loading/StreamProcessor.cpp rename to src/ZoneLoading/Loading/StreamProcessor.cpp diff --git a/src/ZoneLoader/Loading/StreamProcessor.h b/src/ZoneLoading/Loading/StreamProcessor.h similarity index 100% rename from src/ZoneLoader/Loading/StreamProcessor.h rename to src/ZoneLoading/Loading/StreamProcessor.h diff --git a/src/ZoneLoader/Loading/ZoneLoader.cpp b/src/ZoneLoading/Loading/ZoneLoader.cpp similarity index 100% rename from src/ZoneLoader/Loading/ZoneLoader.cpp rename to src/ZoneLoading/Loading/ZoneLoader.cpp diff --git a/src/ZoneLoader/Loading/ZoneLoader.h b/src/ZoneLoading/Loading/ZoneLoader.h similarity index 100% rename from src/ZoneLoader/Loading/ZoneLoader.h rename to src/ZoneLoading/Loading/ZoneLoader.h diff --git a/src/ZoneLoader/Zone/Stream/IZoneInputStream.h b/src/ZoneLoading/Zone/Stream/IZoneInputStream.h similarity index 100% rename from src/ZoneLoader/Zone/Stream/IZoneInputStream.h rename to src/ZoneLoading/Zone/Stream/IZoneInputStream.h diff --git a/src/ZoneLoader/Zone/Stream/Impl/XBlockInputStream.cpp b/src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp similarity index 100% rename from src/ZoneLoader/Zone/Stream/Impl/XBlockInputStream.cpp rename to src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp diff --git a/src/ZoneLoader/Zone/Stream/Impl/XBlockInputStream.h b/src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.h similarity index 100% rename from src/ZoneLoader/Zone/Stream/Impl/XBlockInputStream.h rename to src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.h diff --git a/src/ZoneLoading/ZoneLoading.cpp b/src/ZoneLoading/ZoneLoading.cpp new file mode 100644 index 00000000..e4a83d06 --- /dev/null +++ b/src/ZoneLoading/ZoneLoading.cpp @@ -0,0 +1,6 @@ +#include "ZoneLoading.h" + +bool ZoneLoading::LoadZone(std::string& path) +{ + return false; +} \ No newline at end of file diff --git a/src/ZoneLoading/ZoneLoading.h b/src/ZoneLoading/ZoneLoading.h new file mode 100644 index 00000000..d6f375ae --- /dev/null +++ b/src/ZoneLoading/ZoneLoading.h @@ -0,0 +1,8 @@ +#pragma once +#include + +class ZoneLoading +{ +public: + static bool LoadZone(std::string& path); +}; diff --git a/src/ZoneLoader/ZoneLoader.vcxproj b/src/ZoneLoading/ZoneLoading.vcxproj similarity index 98% rename from src/ZoneLoader/ZoneLoader.vcxproj rename to src/ZoneLoading/ZoneLoading.vcxproj index 0e363289..15a422b7 100644 --- a/src/ZoneLoader/ZoneLoader.vcxproj +++ b/src/ZoneLoading/ZoneLoading.vcxproj @@ -61,6 +61,7 @@ + @@ -98,14 +99,16 @@ + 15.0 {C3308B0A-D7C7-4560-B5F7-3654DD4B668D} Win32Proj - ZoneLoader + ZoneLoading 10.0.17763.0 + ZoneLoading diff --git a/src/ZoneWriter/Zone/Stream/IZoneOutputStream.h b/src/ZoneWriting/Zone/Stream/IZoneOutputStream.h similarity index 100% rename from src/ZoneWriter/Zone/Stream/IZoneOutputStream.h rename to src/ZoneWriting/Zone/Stream/IZoneOutputStream.h diff --git a/src/ZoneWriter/ZoneWriter.vcxproj b/src/ZoneWriting/ZoneWriting.vcxproj similarity index 98% rename from src/ZoneWriter/ZoneWriter.vcxproj rename to src/ZoneWriting/ZoneWriting.vcxproj index b4528405..ccaf9b46 100644 --- a/src/ZoneWriter/ZoneWriter.vcxproj +++ b/src/ZoneWriting/ZoneWriting.vcxproj @@ -25,8 +25,9 @@ 15.0 {B92A6638-68F9-45D2-AB03-6ED69E349381} Win32Proj - ZoneWriter + ZoneWriting 10.0.17763.0 + ZoneWriting