Merge e985629f09 into 5492b3f231

src/object/client/CGUnit.cpp

@@ -1,6 +1,5 @@
 #include "object/client/CGUnit.hpp"
 #include "object/client/CGObject.hpp"
-#include "object/client/CMovement_C.hpp"
 
 uint32_t CGUnit::GetBaseOffset() {
     return CGObject::TotalFields();
@@ -30,18 +29,10 @@ int32_t CGUnit::GetDisplayID() const {
     return this->Unit()->displayID;
 }
 
-float CGUnit::GetFacing() const {
-    return this->m_move->GetFacing();
-}
-
 int32_t CGUnit::GetNativeDisplayID() const {
     return this->Unit()->nativeDisplayID;
 }
 
-C3Vector CGUnit::GetPosition() const {
-    return this->m_move->GetPosition();
-}
-
 CGUnitData* CGUnit::Unit() const {
     return this->m_unit;
 }

src/object/client/CGUnit.hpp

@@ -2,11 +2,8 @@
 #define OBJECT_CLIENT_CG_UNIT_HPP
 
 #include "util/GUID.hpp"
-#include <tempest/Vector.hpp>
 #include <cstdint>
 
-class CMovement_C;
-
 struct CGUnitData {
     WOWGUID charm;
     WOWGUID summon;
@@ -86,18 +83,13 @@ class CGUnit {
         static uint32_t TotalFieldsSaved();
 
         // Public member functions
-        CGUnit(CMovement_C& move)
-            : m_move(&move) {};
         int32_t GetDisplayID() const;
-        float GetFacing() const;
         int32_t GetNativeDisplayID() const;
-        C3Vector GetPosition() const;
 
     protected:
         // Protected member variables
         CGUnitData* m_unit;
         uint32_t* m_unitSaved;
-        CMovement_C* m_move;
 
         // Protected member functions
         CGUnitData* Unit() const;

src/object/client/CGUnit_C.cpp

@@ -98,8 +98,8 @@ const char* CGUnit_C::GetDisplayRaceNameFromRecord(const ChrRacesRec* raceRec, U
 
 CGUnit_C::CGUnit_C(uint32_t time, CClientObjCreate& objCreate)
     : CGObject_C(time, objCreate)
-    , CGUnit(this->m_localMove)
-    , m_localMove(objCreate.move.status.position28, objCreate.move.status.facing34, this->GetGUID(), this)
+    , m_movement(&this->m_localMovement)
+    , m_localMovement(objCreate.move.status.position28, objCreate.move.status.facing34, this->GetGUID(), this)
 {
     // TODO
 
@@ -136,10 +136,6 @@ int32_t CGUnit_C::GetDisplayID() const {
     return this->CGUnit::GetDisplayID();
 }
 
-float CGUnit_C::GetFacing() const {
-    return this->CGUnit::GetFacing();
-}
-
 int32_t CGUnit_C::GetLocalDisplayID() const {
     return this->m_localDisplayID;
 }
@@ -179,10 +175,6 @@ int32_t CGUnit_C::GetModelFileName(const char*& name) const {
     return modelDataRec->m_modelName ? true : false;
 }
 
-C3Vector CGUnit_C::GetPosition() const {
-    return this->CGUnit::GetPosition();
-}
-
 void CGUnit_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
     // TODO
 

src/object/client/CGUnit_C.hpp

@@ -4,7 +4,7 @@
 #include "object/client/CClientObjCreate.hpp"
 #include "object/client/CGObject_C.hpp"
 #include "object/client/CGUnit.hpp"
-#include "object/client/CMovement_C.hpp"
+#include "object/client/CMovementData_C.hpp"
 #include "object/Types.hpp"
 #include "util/GUID.hpp"
 
@@ -28,10 +28,6 @@ class CGUnit_C : public CGObject_C, public CGUnit {
         // Virtual public member functions
         virtual ~CGUnit_C();
         // TODO
-        virtual C3Vector GetPosition() const;
-        // TODO
-        virtual float GetFacing() const;
-        // TODO
         virtual int32_t GetModelFileName(const char*& name) const;
         // TODO
         virtual int32_t CanHighlight();
@@ -53,15 +49,16 @@ class CGUnit_C : public CGObject_C, public CGUnit {
 
     private:
         // Private member variables
+        CMovementData_C* m_movement;
         // TODO
-        CMovement_C m_localMove;
+        CMovementData_C m_localMovement;
         // TODO
-        CreatureDisplayInfoRec* m_displayInfo = nullptr;
-        CreatureDisplayInfoExtraRec* m_displayInfoExtra = nullptr;
-        CreatureModelDataRec* m_modelData = nullptr;
-        CreatureSoundDataRec* m_soundData = nullptr;
+        CreatureDisplayInfoRec* m_displayInfo;
+        CreatureDisplayInfoExtraRec* m_displayInfoExtra;
+        CreatureModelDataRec* m_modelData;
+        CreatureSoundDataRec* m_soundData;
         // TODO
-        UnitBloodLevelsRec* m_bloodRec = nullptr;
+        UnitBloodLevelsRec* m_bloodRec;
         // TODO
         int32_t m_localDisplayID = 0;
         // TODO

src/object/movement/CPassenger.cpp

@@ -1,31 +1,15 @@
 #include "object/movement/CPassenger.hpp"
 #include <tempest/Matrix.hpp>
 
-float CPassenger::GetFacing() const {
-    return this->GetFacing(this->m_facing);
-}
-
-float CPassenger::GetFacing(float facing) const {
-    // If on transport, transform facing by transport facing
-    if (this->m_transportGUID) {
-        float transportFacing = 0.0f;
-        // TODO MovementGetTransportFacing(this->m_transportGUID);
-
-        return facing + transportFacing;
-    }
-
-    return facing;
-}
-
 C3Vector CPassenger::GetPosition() const {
-    return this->GetPosition(this->m_position);
+    return GetPosition(this->m_position);
 }
 
 C3Vector CPassenger::GetPosition(const C3Vector& position) const {
     // If on transport, transform position by transport matrix
     if (this->m_transportGUID) {
         C44Matrix transportMatrix;
-        // TODO MovementGetTransportMtxX(this->m_transportGUID, &transportMatrix);
+        // MovementGetTransportMtxX(this->m_transportGUID, &transportMatrix);
 
         return position * transportMatrix;
     }

src/object/movement/CPassenger.hpp

@@ -12,8 +12,6 @@ class CPassenger {
             , m_position(position)
             , m_facing(0.0f)
             , m_guid(guid) {};
-        float GetFacing() const;
-        float GetFacing(float facing) const;
         C3Vector GetPosition() const;
         C3Vector GetPosition(const C3Vector& position) const;