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

Add dynamic allocation alignment to be able to load T6 MemoryBlock asset which isnt used at all so why am i doing this again

Browse Source
This commit is contained in:
Jan
2021-03-05 09:23:37 +01:00
parent 286eaadd1c
commit 88c48e8107
12 changed files with 91 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZoneLoading/Game/T6/ContentLoaderT6.cpp
View File

@ -28,7 +28,7 @@
#include "Game/T6/XAssets/mapents/mapents_load_db.h"
#include "Game/T6/XAssets/material/material_load_db.h"
#include "Game/T6/XAssets/materialtechniqueset/materialtechniqueset_load_db.h"
//#include "Game/T6/XAssets/memoryblock/memoryblock_load_db.h"
#include "Game/T6/XAssets/memoryblock/memoryblock_load_db.h"
#include "Game/T6/XAssets/menudef_t/menudef_t_load_db.h"
#include "Game/T6/XAssets/menulist/menulist_load_db.h"
#include "Game/T6/XAssets/physconstraints/physconstraints_load_db.h"
@ -153,7 +153,7 @@ void ContentLoader::LoadXAsset(const bool atStreamStart)
LOAD_ASSET(ASSET_TYPE_SCRIPTPARSETREE, ScriptParseTree, scriptParseTree)
LOAD_ASSET(ASSET_TYPE_KEYVALUEPAIRS, KeyValuePairs, keyValuePairs)
LOAD_ASSET(ASSET_TYPE_VEHICLEDEF, VehicleDef, vehicleDef)
// LOAD_ASSET(ASSET_TYPE_MEMORYBLOCK, MemoryBlock, memoryBlock);
LOAD_ASSET(ASSET_TYPE_MEMORYBLOCK, MemoryBlock, memoryBlock);
LOAD_ASSET(ASSET_TYPE_ADDON_MAP_ENTS, AddonMapEnts, addonMapEnts)
LOAD_ASSET(ASSET_TYPE_TRACER, TracerDef, tracerDef)
LOAD_ASSET(ASSET_TYPE_SKINNEDVERTS, SkinnedVertsDef, skinnedVertsDef)

4
src/ZoneLoading/Zone/Stream/IZoneInputStream.h
View File

@ -8,10 +8,10 @@
class IZoneInputStream : public IZoneStream
{
public:
virtual void* Alloc(int align) = 0;
virtual void* Alloc(unsigned align) = 0;
template<typename T>
T* Alloc(const int align)
T* Alloc(const unsigned align)
{
return static_cast<T*>(Alloc(align));
}

4
src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.cpp
View File

@ -30,7 +30,7 @@ XBlockInputStream::~XBlockInputStream()
assert(m_block_stack.empty());
}
void XBlockInputStream::Align(const int align)
void XBlockInputStream::Align(const unsigned align)
{
assert(!m_block_stack.empty());
@ -78,7 +78,7 @@ block_t XBlockInputStream::PopBlock()
return poppedBlock->m_index;
}
void* XBlockInputStream::Alloc(const int align)
void* XBlockInputStream::Alloc(const unsigned align)
{
assert(!m_block_stack.empty());

4
src/ZoneLoading/Zone/Stream/Impl/XBlockInputStream.h
View File

@ -19,7 +19,7 @@ class XBlockInputStream final : public IZoneInputStream
int m_block_bit_count;
XBlock* m_insert_block;
void Align(int align);
void Align(unsigned align);
public:
XBlockInputStream(std::vector<XBlock*>& blocks, ILoadingStream* stream, int blockBitCount, block_t insertBlock);
@ -28,7 +28,7 @@ public:
void PushBlock(block_t block) override;
block_t PopBlock() override;
void* Alloc(int align) override;
void* Alloc(unsigned align) override;
void LoadDataRaw(void* dst, size_t size) override;
void LoadDataInBlock(void* dst, size_t size) override;