mirror of
https://github.com/whoahq/whoa.git
synced 2026-02-01 00:02:45 +03:00
chore(object): rename parameter for clarity
This commit is contained in:
parent
361d327f30
commit
e2bfef907a
@ -41,15 +41,15 @@ int32_t UpdateObject(CDataStore* msg) {
|
|||||||
SmartGUID guid;
|
SmartGUID guid;
|
||||||
*msg >> guid;
|
*msg >> guid;
|
||||||
|
|
||||||
int32_t reenabled;
|
int32_t reenable;
|
||||||
auto object = GetUpdateObject(guid, &reenabled);
|
auto object = GetUpdateObject(guid, &reenable);
|
||||||
|
|
||||||
if (object) {
|
if (object) {
|
||||||
if (!FillInPartialObjectData(object, object->m_obj->m_guid, msg, false, false)) {
|
if (!FillInPartialObjectData(object, object->m_obj->m_guid, msg, false, false)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reenabled) {
|
if (reenable) {
|
||||||
object->Reenable();
|
object->Reenable();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,8 +167,8 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
|
|||||||
msg->Get(_typeID);
|
msg->Get(_typeID);
|
||||||
auto typeID = static_cast<OBJECT_TYPE_ID>(_typeID);
|
auto typeID = static_cast<OBJECT_TYPE_ID>(_typeID);
|
||||||
|
|
||||||
int32_t reenabled;
|
int32_t reenable;
|
||||||
auto existingObject = GetUpdateObject(guid, &reenabled);
|
auto existingObject = GetUpdateObject(guid, &reenable);
|
||||||
|
|
||||||
if (existingObject) {
|
if (existingObject) {
|
||||||
CClientObjCreate::Skip(msg);
|
CClientObjCreate::Skip(msg);
|
||||||
@ -177,7 +177,7 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reenabled) {
|
if (reenable) {
|
||||||
existingObject->Reenable();
|
existingObject->Reenable();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -219,10 +219,10 @@ void UpdateInRangeObjects(CDataStore* msg) {
|
|||||||
*msg >> guid;
|
*msg >> guid;
|
||||||
|
|
||||||
if (guid != ClntObjMgrGetActivePlayer()) {
|
if (guid != ClntObjMgrGetActivePlayer()) {
|
||||||
int32_t reenabled;
|
int32_t reenable;
|
||||||
auto object = GetUpdateObject(guid, &reenabled);
|
auto object = GetUpdateObject(guid, &reenable);
|
||||||
|
|
||||||
if (object && reenabled) {
|
if (object && reenable) {
|
||||||
object->Reenable();
|
object->Reenable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,8 +14,8 @@ CGObject_C* FindActiveObject(WOWGUID guid) {
|
|||||||
return ClntObjMgrGetCurrent()->m_objects.Ptr(guid, CHashKeyGUID(guid));
|
return ClntObjMgrGetCurrent()->m_objects.Ptr(guid, CHashKeyGUID(guid));
|
||||||
}
|
}
|
||||||
|
|
||||||
CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenabled) {
|
CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenable) {
|
||||||
*reenabled = false;
|
*reenable = false;
|
||||||
|
|
||||||
// Active object
|
// Active object
|
||||||
|
|
||||||
@ -44,7 +44,7 @@ CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenabled) {
|
|||||||
!ClntObjMgrGetCurrent()->m_visibleObjects.IsLinked(disabledObject)
|
!ClntObjMgrGetCurrent()->m_visibleObjects.IsLinked(disabledObject)
|
||||||
&& !ClntObjMgrGetCurrent()->m_reenabledObjects.IsLinked(disabledObject)
|
&& !ClntObjMgrGetCurrent()->m_reenabledObjects.IsLinked(disabledObject)
|
||||||
) {
|
) {
|
||||||
*reenabled = true;
|
*reenable = true;
|
||||||
ClntObjMgrGetCurrent()->m_reenabledObjects.LinkToTail(disabledObject);
|
ClntObjMgrGetCurrent()->m_reenabledObjects.LinkToTail(disabledObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@ class CGObject_C;
|
|||||||
|
|
||||||
CGObject_C* FindActiveObject(WOWGUID guid);
|
CGObject_C* FindActiveObject(WOWGUID guid);
|
||||||
|
|
||||||
CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenabled);
|
CGObject_C* GetUpdateObject(WOWGUID guid, int32_t* reenable);
|
||||||
|
|
||||||
void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate);
|
void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user