josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4591 from elecyb/farsight

Browse Source 
Core/Spells: Update nearby visible objects for new viewpoints
This commit is contained in:
Machiavelli
2012-01-03 03:57:01 -08:00
parent e35fd87d3f aea8b2af44
commit 65aca2b806
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Object.cpp
+5 -1
View File
@@ -1668,7 +1668,11 @@ bool WorldObject::canSeeOrDetect(WorldObject const* obj, bool ignoreStealth, boo
} }
} }
if (!corpseCheck && !IsWithinDist(obj, GetSightRange(obj), false)) WorldObject const* viewpoint = this;
if (Player const* player = this->ToPlayer())
viewpoint = player->GetViewpoint();
if (!corpseCheck && !viewpoint->IsWithinDist(obj, GetSightRange(obj), false))
return false; return false;
} }
src/server/game/Entities/Player/Player.cpp
+5 -2
View File
@@ -22973,8 +22973,11 @@ void Player::SetViewpoint(WorldObject* target, bool apply)
WorldObject* Player::GetViewpoint() const WorldObject* Player::GetViewpoint() const
{ {
if (uint64 guid = GetUInt64Value(PLAYER_FARSIGHT)) if (uint64 guid = GetUInt64Value(PLAYER_FARSIGHT))
return (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_SEER); {
return NULL; WorldObject* viewpoint = (WorldObject*) ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_SEER);
return viewpoint ? viewpoint : (WorldObject*) this; // always expected not NULL
}
return (WorldObject*) this;
} }
bool Player::CanUseBattlegroundObject() bool Player::CanUseBattlegroundObject()