*Update to Mangos 7158.

--HG--
branch : trunk
This commit is contained in:
megamage committed 2009-01-24 11:28:00 -06:00
1 parent f0ebb96064
commit 30f6b38941
16 files changed
+155 -243

No files matched your search

+3 -3
View File
@@ -130,7 +130,7 @@ ObjectAccessor::GetNPCIfCanInteractWith(Player const &player, uint64 guid, uint3
}
Creature*
ObjectAccessor::GetCreatureOrPet(WorldObject const &u, uint64 guid)
ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const &u, uint64 guid)
{
if(Creature *unit = GetPet(guid))
return unit;
@@ -166,7 +166,7 @@ ObjectAccessor::GetUnit(WorldObject const &u, uint64 guid)
if(IS_PLAYER_GUID(guid))
return FindPlayer(guid);
return GetCreatureOrPet(u, guid);
return GetCreatureOrPetOrVehicle(u, guid);
}
Corpse*
@@ -189,7 +189,7 @@ Object* ObjectAccessor::GetObjectByTypeMask(Player const &p, uint64 guid, uint32
if(typemask & TYPEMASK_UNIT)
{
obj = GetCreatureOrPet(p,guid);
obj = GetCreatureOrPetOrVehicle(p,guid);
if(obj) return obj;
}