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

refactor: fix remaining x64 compilation issues

Browse Source
This commit is contained in:
Jan
2025-04-26 12:38:43 +01:00
committed by Jan Laupetin
parent a6107e24a2
commit 365b627523
20 changed files with 128 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ZoneLoading/Game/IW4/ContentLoaderIW4.h
View File

@ -1,4 +1,5 @@
#pragma once
#include "Game/IW4/IW4.h"
#include "Loading/ContentLoaderBase.h"
#include "Loading/IContentLoadingEntryPoint.h"
@ -7,17 +8,18 @@ namespace IW4
{
class ContentLoader final : public ContentLoaderBase, public IContentLoadingEntryPoint
{
XAsset* varXAsset;
ScriptStringList* varScriptStringList;
public:
ContentLoader();
void Load(Zone* zone, IZoneInputStream* stream) override;
private:
void LoadScriptStringList(bool atStreamStart);
void LoadXAsset(bool atStreamStart) const;
void LoadXAssetArray(bool atStreamStart, size_t count);
public:
ContentLoader();
void Load(Zone* zone, IZoneInputStream* stream) override;
XAsset* varXAsset;
ScriptStringList* varScriptStringList;
};
} // namespace IW4

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

@ -25,7 +25,7 @@ public:
LoadDataInBlock(const_cast<void*>(reinterpret_cast<const void*>(dst)), sizeof(T));
}
template<typename T> void Load(T* dst, const uint32_t count)
template<typename T> void Load(T* dst, const size_t count)
{
LoadDataInBlock(const_cast<void*>(reinterpret_cast<const void*>(dst)), count * sizeof(T));
}