diff options
Diffstat (limited to 'src/server/game/Combat')
| -rw-r--r-- | src/server/game/Combat/ThreatManager.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Combat/ThreatManager.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Combat/ThreatManager.cpp b/src/server/game/Combat/ThreatManager.cpp index edf15aaf1ff..85510ab0545 100644 --- a/src/server/game/Combat/ThreatManager.cpp +++ b/src/server/game/Combat/ThreatManager.cpp @@ -269,7 +269,7 @@ HostileReference* ThreatContainer::getReferenceByTarget(Unit* victim) const if (!victim) return NULL; - uint64 const guid = victim->GetGUID(); + ObjectGuid guid = victim->GetGUID(); for (ThreatContainer::StorageType::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i) { HostileReference* ref = (*i); diff --git a/src/server/game/Combat/ThreatManager.h b/src/server/game/Combat/ThreatManager.h index f0741f81067..62b3d10e554 100644 --- a/src/server/game/Combat/ThreatManager.h +++ b/src/server/game/Combat/ThreatManager.h @@ -23,6 +23,7 @@ #include "SharedDefines.h" #include "LinkedReference/Reference.h" #include "UnitEvents.h" +#include "ObjectGuid.h" #include <list> @@ -103,7 +104,7 @@ class HostileReference : public Reference<Unit, ThreatManager> //================================================= - uint64 getUnitGuid() const { return iUnitGuid; } + ObjectGuid getUnitGuid() const { return iUnitGuid; } //================================================= // reference is not needed anymore. realy delete it ! @@ -132,7 +133,7 @@ class HostileReference : public Reference<Unit, ThreatManager> private: float iThreat; float iTempThreatModifier; // used for taunt - uint64 iUnitGuid; + ObjectGuid iUnitGuid; bool iOnline; bool iAccessible; }; |