From c5bd63b79eb4a7270d95b13d887caf5e01dccae9 Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Thu, 26 Feb 2026 07:16:16 -0600
Subject: [PATCH] feat(object): add missing CGUnit_C in-class initializers

---
 src/object/client/CGUnit_C.cpp |  1 -
 src/object/client/CGUnit_C.hpp | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/object/client/CGUnit_C.cpp b/src/object/client/CGUnit_C.cpp
index a13d418..c34cda1 100644
--- a/src/object/client/CGUnit_C.cpp
+++ b/src/object/client/CGUnit_C.cpp
@@ -98,7 +98,6 @@ const char* CGUnit_C::GetDisplayRaceNameFromRecord(const ChrRacesRec* raceRec, U
 
 CGUnit_C::CGUnit_C(uint32_t time, CClientObjCreate& objCreate)
     : CGObject_C(time, objCreate)
-    , m_movement(&this->m_localMovement)
     , m_localMovement(objCreate.move.status.position28, objCreate.move.status.facing34, this->GetGUID(), this)
 {
     // TODO
diff --git a/src/object/client/CGUnit_C.hpp b/src/object/client/CGUnit_C.hpp
index 66bab58..57d09aa 100644
--- a/src/object/client/CGUnit_C.hpp
+++ b/src/object/client/CGUnit_C.hpp
@@ -49,16 +49,16 @@ class CGUnit_C : public CGObject_C, public CGUnit {
 
     private:
         // Private member variables
-        CMovementData_C* m_movement;
+        CMovementData_C* m_movement = &m_localMovement;
         // TODO
         CMovementData_C m_localMovement;
         // TODO
-        CreatureDisplayInfoRec* m_displayInfo;
-        CreatureDisplayInfoExtraRec* m_displayInfoExtra;
-        CreatureModelDataRec* m_modelData;
-        CreatureSoundDataRec* m_soundData;
+        CreatureDisplayInfoRec* m_displayInfo = nullptr;
+        CreatureDisplayInfoExtraRec* m_displayInfoExtra = nullptr;
+        CreatureModelDataRec* m_modelData = nullptr;
+        CreatureSoundDataRec* m_soundData = nullptr;
         // TODO
-        UnitBloodLevelsRec* m_bloodRec;
+        UnitBloodLevelsRec* m_bloodRec = nullptr;
         // TODO
         int32_t m_localDisplayID = 0;
         // TODO