From fe88960e09ba43ce260186d1c911bea2f1ad4f73 Mon Sep 17 00:00:00 2001 From: Ambal Date: Thu, 18 Jun 2009 22:25:00 +0400 Subject: [PATCH] [8042] Speedup search creature/pet/vehicle by guid. Signed-off-by: VladimirMangos --- src/game/ObjectAccessor.cpp | 11 +++++++---- src/shared/revision_nr.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 1689a6947..43c38dde0 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -49,11 +49,14 @@ ObjectAccessor::~ObjectAccessor() {} Creature* ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const &u, uint64 guid) { - if(Creature *unit = GetPet(guid)) - return unit; + if(IS_PLAYER_GUID(guid)) + return NULL; - if(Creature *unit = GetVehicle(guid)) - return unit; + if(IS_PET_GUID(guid)) + return GetPet(guid); + + if(IS_VEHICLE_GUID(guid)) + return GetVehicle(guid); return u.GetMap()->GetCreature(guid); } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a5b8ce876..db384add3 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8041" + #define REVISION_NR "8042" #endif // __REVISION_NR_H__