mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-21 10:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Lots of cmangos commirs applied

Browse source
This commit is contained in:
Charles A Edwards 2016-09-12 17:52:23 +01:00 • committed by Antz
parent 8431568536
commit 18dd18780d
44 changed files with 677 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Object/Object.h
View file

@ -400,6 +400,7 @@ class Object
virtual bool HasQuest(uint32 /* quest_id */) const { return false; }
virtual bool HasInvolvedQuest(uint32 /* quest_id */) const { return false; }
void SetItsNewObject(bool enable) { m_itsNewObject = enable; }
protected:
Object();
@ -435,6 +436,7 @@ class Object
private:
bool m_inWorld;
bool m_itsNewObject;
PackedGuid m_PackGUID;
@ -567,7 +569,7 @@ class WorldObject : public Object
float GetDistanceZ(const WorldObject* obj) const;
bool IsInMap(const WorldObject* obj) const
{
return IsInWorld() && obj->IsInWorld() && (GetMap() == obj->GetMap()) && InSamePhase(obj);
return obj && IsInWorld() && obj->IsInWorld() && (GetMap() == obj->GetMap()) && InSamePhase(obj);
}
bool IsWithinDist3d(float x, float y, float z, float dist2compare) const;
bool IsWithinDist2d(float x, float y, float dist2compare) const;