diff --git a/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.h b/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.h index 8aaeb4de..2b874e9c 100644 --- a/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.h +++ b/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.h @@ -4,34 +4,23 @@ namespace Hedgehog::Base { - struct SSymbolNode - { - xpointer pPrev; - xpointer pNext; - be Hash; - - const char* GetValue() const; - }; - class CSharedString; class CStringSymbol { public: - xpointer m_pSymbolNode; + be m_Index; CStringSymbol(); CStringSymbol(const char* in_pName); CStringSymbol(const CSharedString& in_rName); - const char* GetValue() const; - bool operator==(const CStringSymbol& in_rOther) const; bool operator!=(const CStringSymbol& in_rOther) const; bool operator<(const CStringSymbol& in_rOther) const; }; - SWA_ASSERT_OFFSETOF(CStringSymbol, m_pSymbolNode, 0); + SWA_ASSERT_OFFSETOF(CStringSymbol, m_Index, 0); SWA_ASSERT_SIZEOF(CStringSymbol, 4); } diff --git a/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.inl b/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.inl index ddacb302..b0acc103 100644 --- a/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.inl +++ b/UnleashedRecomp/api/Hedgehog/Base/System/hhSymbol.inl @@ -1,10 +1,5 @@ namespace Hedgehog::Base { - inline const char* SSymbolNode::GetValue() const - { - return reinterpret_cast(this) + sizeof(SSymbolNode); - } - inline CStringSymbol::CStringSymbol() { } @@ -19,23 +14,18 @@ namespace Hedgehog::Base GuestToHostFunction(sub_82E013B0, this, &in_rName); } - inline const char* CStringSymbol::GetValue() const - { - return m_pSymbolNode->GetValue(); - } - inline bool CStringSymbol::operator==(const CStringSymbol& in_rOther) const { - return m_pSymbolNode == in_rOther.m_pSymbolNode; + return m_Index == in_rOther.m_Index; } inline bool CStringSymbol::operator!=(const CStringSymbol& in_rOther) const { - return m_pSymbolNode != in_rOther.m_pSymbolNode; + return m_Index != in_rOther.m_Index; } inline bool CStringSymbol::operator<(const CStringSymbol& in_rOther) const { - return m_pSymbolNode < in_rOther.m_pSymbolNode; + return m_Index < in_rOther.m_Index; } }