Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Misc/Codestyle: Made some changes to function names

Browse Source
This commit is contained in:
Subv
2012-08-19 11:07:21 -05:00
parent 19cec23f39
commit 48e50b8254
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -137,7 +137,7 @@ void GameObject::AddToWorld()
// The state can be changed after GameObject::Create but before GameObject::AddToWorld
bool toggledState = GetGOData() ? GetGOData()->go_state == GO_STATE_READY : false;
if (m_model)
GetMap()->Insert(*m_model);
GetMap()->InsertGameObjectModel(*m_model);
EnableCollision(startOpen ^ toggledState);
WorldObject::AddToWorld();
@@ -154,8 +154,8 @@ void GameObject::RemoveFromWorld()
RemoveFromOwner();
if (m_model)
if (GetMap()->Contains(*m_model))
GetMap()->Remove(*m_model);
if (GetMap()->ContainsGameObjectModel(*m_model))
GetMap()->RemoveGameObjectModel(*m_model);
WorldObject::RemoveFromWorld();
sObjectAccessor->RemoveObject(this);
}
@@ -1971,8 +1971,8 @@ void GameObject::EnableCollision(bool enable)
if (!m_model)
return;
/*if (enable && !GetMap()->Contains(*m_model))
GetMap()->Insert(*m_model);*/
/*if (enable && !GetMap()->ContainsGameObjectModel(*m_model))
GetMap()->InsertGameObjectModel(*m_model);*/
m_model->enable(enable ? GetPhaseMask() : 0);
}
@@ -1982,12 +1982,12 @@ void GameObject::UpdateModel()
if (!IsInWorld())
return;
if (m_model)
if (GetMap()->Contains(*m_model))
GetMap()->Remove(*m_model);
if (GetMap()->ContainsGameObjectModel(*m_model))
GetMap()->RemoveGameObjectModel(*m_model);
delete m_model;
m_model = GameObjectModel::Create(*this);
if (m_model)
GetMap()->Insert(*m_model);
GetMap()->InsertGameObjectModel(*m_model);
}
Player* GameObject::GetLootRecipient() const

6
src/server/game/Maps/Map.h
View File

@@ -439,9 +439,9 @@ class Map : public GridRefManager<NGridType>
float GetHeight(uint32 phasemask, float x, float y, float z, bool vmap = true, float maxSearchDist = DEFAULT_HEIGHT_SEARCH) const;
bool isInLineOfSight(float x1, float y1, float z1, float x2, float y2, float z2, uint32 phasemask) const;
void Balance() { _dynamicTree.balance(); }
void Remove(const GameObjectModel& mdl) { _dynamicTree.remove(mdl); }
void Insert(const GameObjectModel& mdl) { _dynamicTree.insert(mdl); }
bool Contains(const GameObjectModel& mdl) const { return _dynamicTree.contains(mdl);}
void RemoveGameObjectModel(const GameObjectModel& model) { _dynamicTree.remove(model); }
void InsertGameObjectModel(const GameObjectModel& model) { _dynamicTree.insert(model); }
bool ContainsGameObjectModel(const GameObjectModel& model) const { return _dynamicTree.contains(model);}
bool getObjectHitPos(uint32 phasemask, float x1, float y1, float z1, float x2, float y2, float z2, float& rx, float &ry, float& rz, float modifyDist);
/*