Compare commits

..

1 Commits

Author SHA1 Message Date
Tristan 'Natrist' Cormier
82a9d12b82
Merge a82628adaa into b4751725a6 2026-02-10 08:55:58 +01:00
4 changed files with 2 additions and 26 deletions

View File

@ -95,7 +95,7 @@ void CGObject_C::Disable() {
this->m_disableTimeMs = CWorld::GetCurTimeMs();
}
int32_t CGObject_C::GetModelFileName(const char*& name) const {
int32_t CGObject_C::GetModelFileName(const char*& name) {
return false;
}

View File

@ -36,7 +36,7 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
virtual void HandleOutOfRange(OUT_OF_RANGE_TYPE type) {};
virtual void UpdateWorldObject(int32_t a2);
// TODO
virtual int32_t GetModelFileName(const char*& name) const;
virtual int32_t GetModelFileName(const char*& name);
// TODO
virtual int32_t CanHighlight();
virtual int32_t CanBeTargetted();

View File

@ -115,26 +115,6 @@ int32_t CGUnit_C::CanBeTargetted() {
return this->CanHighlight();
}
CreatureModelDataRec* CGUnit_C::GetModelData() const {
// TODO
return nullptr;
}
int32_t CGUnit_C::GetModelFileName(const char*& name) const {
auto modelDataRec = this->GetModelData();
// Model data not found
if (!modelDataRec) {
name = "Spells\\ErrorCube.mdx";
return true;
}
name = modelDataRec->m_modelName;
return modelDataRec->m_modelName ? true : false;
}
void CGUnit_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
// TODO

View File

@ -9,7 +9,6 @@
class ChrClassesRec;
class ChrRacesRec;
class CreatureModelDataRec;
class CGUnit_C : public CGObject_C, public CGUnit {
public:
@ -23,15 +22,12 @@ class CGUnit_C : public CGObject_C, public CGUnit {
// Virtual public member functions
virtual ~CGUnit_C();
// TODO
virtual int32_t GetModelFileName(const char*& name) const;
// TODO
virtual int32_t CanHighlight();
virtual int32_t CanBeTargetted();
// TODO
// Public member functions
CGUnit_C(uint32_t time, CClientObjCreate& objCreate);
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);