Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4
This commit is contained in:
commit
0b0539350d
4 files changed
+6
-1
No files matched your search
@@ -26,6 +26,7 @@
|
||||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
|
||||
// move map related classes
|
||||
namespace MMAP
|
||||
@@ -132,4 +133,4 @@ namespace MMAP
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "BattlenetPacketCrypt.h"
|
||||
#include "Socket.h"
|
||||
#include "BigNumber.h"
|
||||
#include "Database/DatabaseEnv.h"
|
||||
#include <memory>
|
||||
#include <boost/asio/ip/tcp.hpp>
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "ScriptMgr.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "SpellScript.h"
|
||||
#include "Player.h"
|
||||
#include "Vehicle.h"
|
||||
#include "stonecore.h"
|
||||
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
#include "ObjectGuid.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "ScriptMgr.h"
|
||||
#include "SpellScript.h"
|
||||
#include "ScriptedCreature.h"
|
||||
#include "Player.h"
|
||||
#include "stonecore.h"
|
||||
|
||||
enum Texts
|
||||
|
||||
Reference in new issue
Block a user