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

move parts to new common component to avoid circular dependency of zonecommon and objcommon

Browse Source
This commit is contained in:
Jan
2021-03-03 12:56:15 -08:00
parent d616738be4
commit 12461d27e7
38 changed files with 70 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ZoneCommon/Zone/Zone.h
View File

@ -1,14 +1,15 @@
#pragma once
#include <memory>
#include "ZoneTypes.h"
#include <memory>
#include <string>
#include <vector>
#include "Zone/ZoneTypes.h"
#include "Pool/ZoneAssetPools.h"
#include "Game/IGame.h"
#include "Game/GameLanguage.h"
#include "Zone/XBlock.h"
#include "ZoneMemory.h"
#include <string>
#include <vector>
class IGame;
class ZoneAssetPools;

28
src/ZoneCommon/Zone/ZoneTypes.h
View File

@ -1,28 +0,0 @@
#pragma once
#include <cstdint>
struct ZoneHeader
{
uint8_t m_magic[8];
uint32_t m_version;
};
#ifdef ARCH_x64
typedef uint32_t scr_string_t;
typedef uint64_t xchunk_size_t;
typedef uint64_t xblock_size_t;
typedef uint64_t zone_pointer_t;
constexpr uint16_t SCR_STRING_MAX = UINT32_MAX;
#elif ARCH_x86
typedef uint16_t scr_string_t;
typedef uint32_t xchunk_size_t;
typedef uint32_t xblock_size_t;
typedef uint32_t zone_pointer_t;
constexpr uint16_t SCR_STRING_MAX = UINT16_MAX;
#endif
typedef int block_t;
typedef int asset_type_t;
typedef unsigned int zone_priority_t;