diff --git a/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db2.cpp b/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db2.cpp deleted file mode 100644 index 90172456..00000000 --- a/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db2.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "rawfile_load_db2.h" -#include - -using namespace T6; - -RawFileLoader::RawFileLoader(IZoneScriptStringProvider* scriptStringProvider, Zone* zone, IZoneInputStream* stream) - : AssetLoader(ASSET_TYPE_RAWFILE, scriptStringProvider, zone, stream){} - -void RawFileLoader::LoadRawFile(RawFile* pRawFile, const bool atStreamStart) -{ - assert(pRawFile != nullptr); - - if(atStreamStart) - m_stream->Load(); - - m_stream->PushBlock(XFILE_BLOCK_VIRTUAL); - - LoadXString(&pRawFile->name); - - if(pRawFile->buffer != nullptr) - { - assert(pRawFile->buffer == PTR_FOLLOWING); - - pRawFile->buffer = m_stream->Alloc(16); - m_stream->Load(pRawFile->len + 1); - } - - m_stream->PopBlock(); -} - -void RawFileLoader::LoadRawFileAsset(RawFile** pPtr) -{ - assert(pPtr != nullptr); - *pPtr = static_cast(LinkAsset(GetRawFileName(*pPtr), *pPtr)); -} - -void RawFileLoader::LoadRawFilePtr(RawFile** pPtr) -{ - assert(pPtr != nullptr); - - m_stream->PushBlock(XFILE_BLOCK_TEMP); - - if(*pPtr != nullptr) - { - if(*pPtr == PTR_FOLLOWING || *pPtr == PTR_INSERT) - { - RawFile** toInsert = nullptr; - if(*pPtr == PTR_INSERT) - toInsert = m_stream->InsertPointer(); - - *pPtr = m_stream->Alloc(); - LoadRawFile(*pPtr, true); - LoadRawFileAsset(pPtr); - - if(toInsert != nullptr) - *toInsert = *pPtr; - } - else - { - *pPtr = m_stream->ConvertOffsetToAlias(*pPtr); - } - } - - m_stream->PopBlock(); -} - -std::string RawFileLoader::GetRawFileName(RawFile* pRawFile) -{ - return pRawFile->name; -} \ No newline at end of file diff --git a/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db2.h b/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db2.h deleted file mode 100644 index 505985f6..00000000 --- a/src/ZoneLoading/Game/T6/XAssets/rawfile/rawfile_load_db2.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once -#include "Loading/AssetLoader.h" -#include "Game/T6/T6.h" - -namespace T6 -{ - class RawFileLoader final : public AssetLoader - { - void LoadRawFile(RawFile* pRawFile, bool atStreamStart); - void LoadRawFileAsset(RawFile** pPtr); - - public: - RawFileLoader(IZoneScriptStringProvider* scriptStringProvider, Zone* zone, IZoneInputStream* stream); - - void LoadRawFilePtr(RawFile** pPtr); - static std::string GetRawFileName(RawFile* pRawFile); - }; -} diff --git a/src/ZoneLoading/ZoneLoading.vcxproj b/src/ZoneLoading/ZoneLoading.vcxproj index 4a38c2b2..1cfbdc32 100644 --- a/src/ZoneLoading/ZoneLoading.vcxproj +++ b/src/ZoneLoading/ZoneLoading.vcxproj @@ -67,7 +67,6 @@ - @@ -162,7 +161,6 @@ -