Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Phases: Get rid of IsInSamePhase

Browse Source
This commit is contained in:
Discover- committed 2014-10-28 17:40:57 +01:00
1 parent 44c14799f3
commit dc9ff5260b
3 files changed
+2 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/Object/Object.cpp
-6
View File
@@ -2752,12 +2752,6 @@ bool WorldObject::IsInPhase(WorldObject const* obj) const
return Trinity::Containers::Intersects(_phases.begin(), _phases.end(), obj->GetPhases().begin(), obj->GetPhases().end());
}
bool WorldObject::InSamePhase(WorldObject const* obj) const
{
return IsInPhase(obj);
// return InSamePhase(obj->GetPhaseMask());
}
void WorldObject::PlayDistanceSound(uint32 sound_id, Player* target /*= NULL*/)
{
WorldPacket data(SMSG_PLAY_OBJECT_SOUND, 4 + 8);
src/server/game/Entities/Object/Object.h
-2
View File
@@ -595,8 +595,6 @@ class WorldObject : public Object, public WorldLocation
virtual void SetInPhase(uint32 id, bool update, bool apply);
void RebuildTerrainSwaps();
uint32 GetPhaseMask() const { return m_phaseMask; }
bool InSamePhase(WorldObject const* obj) const;
bool InSamePhase(uint32 phasemask) const { return (GetPhaseMask() & phasemask) != 0; }
bool IsInPhase(uint32 phase) const { return _phases.find(phase) != _phases.end(); }
bool IsInPhase(WorldObject const* obj) const;
bool IsInTerrainSwap(uint32 terrainSwap) const { return _terrainSwaps.find(terrainSwap) != _terrainSwaps.end(); }