AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 08:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Various imps and minor fixes

Browse Source
This commit is contained in:
Phillip Stephens
2017-07-30 04:00:30 -07:00
parent c06c1e464b
commit db03927e1d
29 changed files with 364 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/RetroTypes.hpp
View File

@@ -14,12 +14,13 @@ namespace urde
using FourCC = hecl::FourCC;
using ResId = u64;
#define kInvalidResId ResId(-1)
struct SObjectTag
{
FourCC type;
ResId id = -1;
operator bool() const { return (id & 0xffffffff) != 0xffffffff; }
ResId id = kInvalidResId;
operator bool() const { return (id != kInvalidResId); }
bool operator!=(const SObjectTag& other) const { return id != other.id; }
bool operator==(const SObjectTag& other) const { return id == other.id; }
bool operator<(const SObjectTag& other) const { return id < other.id; }
@@ -41,10 +42,10 @@ struct TEditorId
{
TEditorId() = default;
TEditorId(u32 idin) : id(idin) {}
u32 id = -1;
u8 LayerNum() const { return (id >> 26) & 0x3f; }
u16 AreaNum() const { return (id >> 16) & 0x3ff; }
u16 Id() const { return id & 0xffff; }
u32 id = u32(-1);
u8 LayerNum() const { return u8((id >> 26) & 0x3f); }
u16 AreaNum() const { return u16((id >> 16) & 0x3ff); }
u16 Id() const { return u16(id & 0xffff); }
bool operator<(const TEditorId& other) const { return (id & 0x3ffffff) < (other.id & 0x3ffffff); }
bool operator!=(const TEditorId& other) const { return (id & 0x3ffffff) != (other.id & 0x3ffffff); }
@@ -57,7 +58,6 @@ using TAreaId = s32;
#define kInvalidEditorId TEditorId()
#define kInvalidUniqueId TUniqueId(-1)
#define kInvalidAreaId TAreaId(-1)
#define kInvalidResId ResId(-1)
}
#if 0