INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-11 07:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

move contentloader classes to their respective game namespaces

Browse Source
This commit is contained in:
Jan
2020-10-17 15:55:19 +02:00
parent 464f8231df
commit f0c8ffa6be
8 changed files with 155 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZoneLoading/Loading/AssetLoader.h
View File

@ -1,9 +1,9 @@
#pragma once
#include "Pool/XAssetInfo.h"
#include "ContentLoader.h"
#include "ContentLoaderBase.h"
#include "IZoneScriptStringProvider.h"
class AssetLoader : public ContentLoader
class AssetLoader : public ContentLoaderBase
{
asset_type_t m_asset_type;

12
src/ZoneLoading/Loading/ContentLoader.cpp → src/ZoneLoading/Loading/ContentLoaderBase.cpp
View File

@ -1,10 +1,10 @@
#include "ContentLoader.h"
#include "ContentLoaderBase.h"
#include <cassert>
const void* ContentLoader::PTR_FOLLOWING = reinterpret_cast<void*>(-1);
const void* ContentLoader::PTR_INSERT = reinterpret_cast<void*>(-2);
const void* ContentLoaderBase::PTR_FOLLOWING = reinterpret_cast<void*>(-1);
const void* ContentLoaderBase::PTR_INSERT = reinterpret_cast<void*>(-2);
ContentLoader::ContentLoader()
ContentLoaderBase::ContentLoaderBase()
{
varXString = nullptr;
@ -12,7 +12,7 @@ ContentLoader::ContentLoader()
m_stream = nullptr;
}
void ContentLoader::LoadXString(const bool atStreamStart) const
void ContentLoaderBase::LoadXString(const bool atStreamStart) const
{
assert(varXString != nullptr);
@ -33,7 +33,7 @@ void ContentLoader::LoadXString(const bool atStreamStart) const
}
}
void ContentLoader::LoadXStringArray(const bool atStreamStart, const size_t count)
void ContentLoaderBase::LoadXStringArray(const bool atStreamStart, const size_t count)
{
assert(varXString != nullptr);

6
src/ZoneLoading/Loading/ContentLoader.h → src/ZoneLoading/Loading/ContentLoaderBase.h
View File

@ -3,7 +3,7 @@
#include "Zone/Zone.h"
#include "Zone/Stream/IZoneInputStream.h"
class ContentLoader
class ContentLoaderBase
{
protected:
static const void* PTR_FOLLOWING;
@ -14,11 +14,11 @@ protected:
Zone* m_zone;
IZoneInputStream* m_stream;
ContentLoader();
ContentLoaderBase();
void LoadXString(bool atStreamStart) const;
void LoadXStringArray(bool atStreamStart, size_t count);
public:
virtual ~ContentLoader() = default;
virtual ~ContentLoaderBase() = default;
};