Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Player/Player.h src/server/game/Globals/ObjectMgr.h
This commit is contained in:
commit
13ec761ad2
56 files changed
+156
-419
No files matched your search
@@ -53,7 +53,7 @@ class SystemMgr
|
||||
~SystemMgr() { }
|
||||
|
||||
public:
|
||||
typedef UNORDERED_MAP<uint32, ScriptPointVector> PointMoveMap;
|
||||
typedef std::unordered_map<uint32, ScriptPointVector> PointMoveMap;
|
||||
|
||||
//Database
|
||||
void LoadScriptWaypoints();
|
||||
|
||||
Reference in new issue
Block a user