josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Vehicles: Remove Vehicle.h dependency from other header files

Browse Source
This commit is contained in:
Spp
2011-08-03 12:28:42 +02:00
parent e7327e7e94
commit 7e53a73059
20 changed files with 135 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+17
View File
@@ -8993,3 +8993,20 @@ CreatureTemplate const* ObjectMgr::GetCreatureTemplate(uint32 entry)
return NULL;
}
VehicleAccessoryList const* ObjectMgr::GetVehicleAccessoryList(Vehicle* veh) const
{
if (Creature* cre = veh->GetBase()->ToCreature())
{
// Give preference to GUID-based accessories
VehicleAccessoryMap::const_iterator itr = m_VehicleAccessoryMap.find(cre->GetDBTableGUIDLow());
if (itr != m_VehicleAccessoryMap.end())
return &itr->second;
}
// Otherwise return entry-based
VehicleAccessoryMap::const_iterator itr = m_VehicleTemplateAccessoryMap.find(veh->GetCreatureEntry());
if (itr != m_VehicleTemplateAccessoryMap.end())
return &itr->second;
return NULL;
}
src/server/game/Globals/ObjectMgr.h
+2 -17
View File
@@ -36,7 +36,7 @@
#include "ObjectAccessor.h"
#include "ObjectDefines.h"
#include <ace/Singleton.h>
#include "Vehicle.h"
#include "VehicleDefines.h"
#include <string>
#include <map>
#include <limits>
@@ -772,22 +772,7 @@ class ObjectMgr
return NULL;
}
VehicleAccessoryList const* GetVehicleAccessoryList(Vehicle* veh) const
{
if (Creature* cre = veh->GetBase()->ToCreature())
{
// Give preference to GUID-based accessories
VehicleAccessoryMap::const_iterator itr = m_VehicleAccessoryMap.find(cre->GetDBTableGUIDLow());
if (itr != m_VehicleAccessoryMap.end())
return &itr->second;
}
// Otherwise return entry-based
VehicleAccessoryMap::const_iterator itr = m_VehicleTemplateAccessoryMap.find(veh->GetCreatureEntry());
if (itr != m_VehicleTemplateAccessoryMap.end())
return &itr->second;
return NULL;
}
VehicleAccessoryList const* GetVehicleAccessoryList(Vehicle* veh) const;
DungeonEncounterList const* GetDungeonEncounterList(uint32 mapId, Difficulty difficulty)
{