RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-03-18 05:31:07 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(object): move CMovement_C pointer to proper location in CGUnit

Browse Source
This commit is contained in:
fallenoak 2026-02-27 20:12:08 -06:00
parent c5bd63b79e
commit 1b90dcb09b
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/object/client/CGUnit.hpp
View File

@ -4,6 +4,8 @@
#include "util/GUID.hpp"
#include <cstdint>
class CMovement_C;
struct CGUnitData {
WOWGUID charm;
WOWGUID summon;
@ -83,6 +85,8 @@ class CGUnit {
static uint32_t TotalFieldsSaved();
// Public member functions
CGUnit(CMovement_C& move)
: m_move(&move) {};
int32_t GetDisplayID() const;
int32_t GetNativeDisplayID() const;
@ -90,6 +94,7 @@ class CGUnit {
// Protected member variables
CGUnitData* m_unit;
uint32_t* m_unitSaved;
CMovement_C* m_move;
// Protected member functions
CGUnitData* Unit() const;

3
src/object/client/CGUnit_C.cpp
View File

@ -98,7 +98,8 @@ const char* CGUnit_C::GetDisplayRaceNameFromRecord(const ChrRacesRec* raceRec, U
CGUnit_C::CGUnit_C(uint32_t time, CClientObjCreate& objCreate)
: CGObject_C(time, objCreate)
, m_localMovement(objCreate.move.status.position28, objCreate.move.status.facing34, this->GetGUID(), this)
, CGUnit(this->m_localMove)
, m_localMove(objCreate.move.status.position28, objCreate.move.status.facing34, this->GetGUID(), this)
{
// TODO

5
src/object/client/CGUnit_C.hpp
View File

@ -4,7 +4,7 @@
#include "object/client/CClientObjCreate.hpp"
#include "object/client/CGObject_C.hpp"
#include "object/client/CGUnit.hpp"
#include "object/client/CMovementData_C.hpp"
#include "object/client/CMovement_C.hpp"
#include "object/Types.hpp"
#include "util/GUID.hpp"
@ -49,9 +49,8 @@ class CGUnit_C : public CGObject_C, public CGUnit {
private:
// Private member variables
CMovementData_C* m_movement = &m_localMovement;
// TODO
CMovementData_C m_localMovement;
CMovement_C m_localMove;
// TODO
CreatureDisplayInfoRec* m_displayInfo = nullptr;
CreatureDisplayInfoExtraRec* m_displayInfoExtra = nullptr;