mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 22:37:03 +00:00
Merge commit 'origin/master' into 320
Conflicts: src/game/Player.cpp
This commit is contained in:
commit
3882772658
42 changed files with 696 additions and 487 deletions
|
|
@ -670,7 +670,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject
|
|||
|
||||
void TriggeringLinkedGameObject( uint32 trapEntry, Unit* target);
|
||||
|
||||
bool isVisibleForInState(Player const* u, bool inVisibleList) const;
|
||||
bool isVisibleForInState(Player const* u, WorldObject const* viewPoint, bool inVisibleList) const;
|
||||
|
||||
GameObject* LookupFishingHoleAround(float range);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue