Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/World/IWorld.h
#	src/server/game/World/World.cpp
#	src/server/game/World/World.h
#	src/server/scripts/Commands/cs_server.cpp
This commit is contained in:
郑佩茹
2022-05-02 16:39:21 -06:00
99 changed files with 839 additions and 5304 deletions

View File

@@ -23,6 +23,7 @@
#include <iomanip>
#include <set>
#include <sstream>
#include <boost/filesystem.hpp>
using G3D::Vector3;
using G3D::AABox;
@@ -54,7 +55,7 @@ namespace VMAP
TileAssembler::TileAssembler(const std::string& pSrcDirName, const std::string& pDestDirName)
: iDestDir(pDestDirName), iSrcDir(pSrcDirName)
{
//mkdir(iDestDir);
boost::filesystem::create_directory(iDestDir);
//init();
}