diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc index 390dbc05..580bfc8c 100644 --- a/server/gameserver/mapinstance.cc +++ b/server/gameserver/mapinstance.cc @@ -15,6 +15,7 @@ #include "mapmgr.h" #include "room.h" #include "entityfactory.h" +#include "mt/MetaMgr.h" #include "mt/Param.h" #include "mt/Map.h" @@ -83,9 +84,7 @@ void MapInstance::Init() } { navmesh_ = dtAllocNavMesh(); - // 111 - #if 0 - FILE *fp = fopen((MetaMgr::Instance()->GetResDir() + "map3.bin").c_str(), "rb"); + FILE *fp = fopen((mt::MetaMgr::Instance()->GetResDir() + "map3.bin").c_str(), "rb"); if(fp){ //fseek(fp, 0, SEEK_END); //int file_size = ftell(fp); @@ -160,7 +159,6 @@ void MapInstance::Init() } fclose(fp); } - #endif } navmesh_query_ = new dtNavMeshQuery(); navmesh_query_->init(navmesh_, 1024); diff --git a/server/gameserver/mt/MetaMgr.h b/server/gameserver/mt/MetaMgr.h index 852b8e0a..a7e5c455 100644 --- a/server/gameserver/mt/MetaMgr.h +++ b/server/gameserver/mt/MetaMgr.h @@ -131,6 +131,7 @@ namespace mt return p; } + const std::string GetResDir() { return res_path_; } private: std::vector meta_tables; std::string res_path_;