Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Use getworldobject for getunit. Also allow get vehicles using this function.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-23 20:42:31 -05:00
parent 2475390852
commit 94692ea5f7
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/ObjectAccessor.cpp
View File

@@ -60,6 +60,7 @@ ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const &u, uint64 guid)
return u.GetMap()->GetCreature(guid);
}
/*
Unit*
ObjectAccessor::GetUnit(WorldObject const &u, uint64 guid)
{
@@ -71,6 +72,7 @@ ObjectAccessor::GetUnit(WorldObject const &u, uint64 guid)
return GetCreatureOrPetOrVehicle(u, guid);
}
*/
Corpse*
ObjectAccessor::GetCorpse(WorldObject const &u, uint64 guid)

13
src/game/ObjectAccessor.h
View File

@@ -103,13 +103,16 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
if(!guid)
return NULL;
if (IS_PLAYER_GUID(guid))
if(IS_PLAYER_GUID(guid))
return (Unit*)HashMapHolder<Player>::Find(guid);
if (Unit* u = (Unit*)HashMapHolder<Pet>::Find(guid))
return u;
if(IS_CREATURE_GUID(guid))
return (Unit*)HashMapHolder<Creature>::Find(guid);
return (Unit*)HashMapHolder<Creature>::Find(guid);
if(IS_PET_GUID(guid))
return (Unit*)HashMapHolder<Pet>::Find(guid);
return (Unit*)HashMapHolder<Vehicle>::Find(guid);
}
template<class T> static T* GetObjectInWorld(uint32 mapid, float x, float y, uint64 guid, T* /*fake*/)
@@ -140,7 +143,7 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
static Object* GetObjectByTypeMask(WorldObject const &, uint64, uint32 typemask);
static Creature* GetCreatureOrPetOrVehicle(WorldObject const &, uint64);
static Unit* GetUnit(WorldObject const &, uint64);
static Unit* GetUnit(WorldObject const &, uint64 guid) { return GetObjectInWorld(guid, (Unit*)NULL); }
static Pet* GetPet(Unit const &, uint64 guid) { return GetPet(guid); }
static Player* GetPlayer(Unit const &, uint64 guid) { return FindPlayer(guid); }
static Corpse* GetCorpse(WorldObject const &u, uint64 guid);