Core/Game: Include cleanup part 5

* ObjectMgr.h
* Player.h
* Unit.h
* G3D should no longer propagate everywhere from Spline/MotionMaster
This commit is contained in:
Shauren
2017-06-04 01:00:45 +02:00
parent ec72a59b08
commit b453e12423
442 changed files with 3521 additions and 2850 deletions

View File

@@ -21,11 +21,11 @@
#include "Define.h"
#include "Hash.h"
#include "SplineChain.h"
#include <unordered_map>
#include <vector>
class Creature;
struct SplineChainLink;
#define TEXT_SOURCE_RANGE -1000000 //the amount of entries each text source has available
@@ -68,8 +68,10 @@ typedef std::vector<ScriptPointMove> ScriptPointVector;
class TC_GAME_API SystemMgr
{
private:
SystemMgr() { }
~SystemMgr() { }
SystemMgr();
~SystemMgr();
SystemMgr(SystemMgr const&) = delete;
SystemMgr& operator=(SystemMgr const&) = delete;
public:
static SystemMgr* instance();
@@ -90,20 +92,13 @@ class TC_GAME_API SystemMgr
return &itr->second;
}
SplineChain const* GetSplineChain(uint32 entry, uint16 chainId) const
{
auto it = m_mSplineChainsMap.find({ entry, chainId });
if (it == m_mSplineChainsMap.end())
return nullptr;
return &it->second;
}
SplineChain const* GetSplineChain(Creature const* who, uint16 id) const;
std::vector<SplineChainLink> const* GetSplineChain(uint32 entry, uint16 chainId) const;
std::vector<SplineChainLink> const* GetSplineChain(Creature const* who, uint16 id) const;
protected:
PointMoveMap m_mPointMoveMap; //coordinates for waypoints
typedef std::pair<uint32, uint16> ChainKeyType; // creature entry + chain ID
std::unordered_map<ChainKeyType, SplineChain> m_mSplineChainsMap; // spline chains
std::unordered_map<ChainKeyType, std::vector<SplineChainLink>> m_mSplineChainsMap; // spline chains
};
#define sScriptSystemMgr SystemMgr::instance()