Merge 4a102c6ace into 5a69128f63

src/object/client/CGUnit.cpp

@@ -25,14 +25,6 @@ uint32_t CGUnit::TotalFieldsSaved() {
     return CGUnit::GetBaseOffsetSaved() + 123;
 }
 
-int32_t CGUnit::GetDisplayID() const {
-    return this->Unit()->displayID;
-}
-
-int32_t CGUnit::GetNativeDisplayID() const {
-    return this->Unit()->nativeDisplayID;
-}
-
 CGUnitData* CGUnit::Unit() const {
     return this->m_unit;
 }

src/object/client/CGUnit.hpp

@@ -82,10 +82,6 @@ class CGUnit {
         static uint32_t TotalFields();
         static uint32_t TotalFieldsSaved();
 
-        // Public member functions
-        int32_t GetDisplayID() const;
-        int32_t GetNativeDisplayID() const;
-
     protected:
         // Protected member variables
         CGUnitData* m_unit;

src/object/client/CGUnit_C.cpp

@@ -115,32 +115,9 @@ int32_t CGUnit_C::CanBeTargetted() {
     return this->CanHighlight();
 }
 
-int32_t CGUnit_C::GetLocalDisplayID() const {
-    return this->m_localDisplayID;
-}
-
 CreatureModelDataRec* CGUnit_C::GetModelData() const {
-    // Prefer local display ID if set and unit's display ID hasn't been overridden from unit's
-    // native display ID; otherwise prefer overridden display ID.
-    auto displayID = this->GetLocalDisplayID() && this->GetDisplayID() == this->GetNativeDisplayID()
-        ? this->GetLocalDisplayID()
-        : this->GetDisplayID();
-
-    auto creatureDisplayInfoRec = g_creatureDisplayInfoDB.GetRecord(displayID);
-
-    if (!creatureDisplayInfoRec) {
-        // TODO SysMsgPrintf(1, 2, "NOCREATUREDISPLAYIDFOUND|%d", displayID);
+    // TODO
     return nullptr;
-    }
-
-    auto creatureModelDataRec = g_creatureModelDataDB.GetRecord(creatureDisplayInfoRec->m_modelID);
-
-    if (!creatureModelDataRec) {
-        // TODO SysMsgPrintf(1, 16, "INVALIDDISPLAYMODELRECORD|%d|%d", creatureDisplayInfoRec->m_modelID, creatureDisplayInfoRec->m_ID);
-        return nullptr;
-    }
-
-    return creatureModelDataRec;
 }
 
 int32_t CGUnit_C::GetModelFileName(const char*& name) const {

src/object/client/CGUnit_C.hpp

@@ -31,17 +31,10 @@ class CGUnit_C : public CGObject_C, public CGUnit {
 
         // Public member functions
         CGUnit_C(uint32_t time, CClientObjCreate& objCreate);
-        int32_t GetLocalDisplayID() const;
         CreatureModelDataRec* GetModelData() const;
         void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void PostMovementUpdate(const CClientMoveUpdate& move, int32_t activeMover);
         void SetStorage(uint32_t* storage, uint32_t* saved);
-
-    private:
-        // Private member variables
-        // TODO
-        int32_t m_localDisplayID = 0;
-        // TODO
 };
 
 #endif