server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-03-26 20:17:57 +08:00
parent 6e0392cb3c
commit 3a41ec8428
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/mapinstance.cc
View File

@ -153,9 +153,10 @@ void MapInstance::CreateThings()
void MapInstance::CreateTerrain()
{
metatable::TerrainJson* terrain = MetaMgr::Instance()->GetTerrainJson(map_id);
std::list<metatable::MapLayerJson>* layers = MetaMgr::Instance()->GetMapLayer(map_tpl_name_);
std::list<metatable::MapLayerJson>* layers = MetaMgr::Instance()->GetMapLayer(map_meta_->i->map_pic());
if (!terrain || !layers) {
abort();
return;
//abort();
}
if (layers->empty()) {
return;

6
server/gameserver/metamgr.cc
View File

@ -468,7 +468,7 @@ private:
itr->second.clear();
}
std::string filename = res_path + "map" + meta.map_pic() + ".layers.json";
if (access("test.c", F_OK) != -1) {
if (access(filename.c_str(), F_OK) != -1) {
f8::ReadJsonMetaFile(filename, itr->second);
}
}
@ -753,7 +753,7 @@ MetaData::SafeArea* MetaMgr::GetSafeArea(int area_id)
return itr != loader_->safearea_hash.end() ? itr->second : nullptr;
}
std::vector<MetaData::MapTplThing>* MetaMgr::GetMapTplThing(std::string& map_name)
std::vector<MetaData::MapTplThing>* MetaMgr::GetMapTplThing(const std::string& map_name)
{
auto itr = loader_->maptpl_hash.find(map_name);
return itr != loader_->maptpl_hash.end() ? &itr->second : nullptr;
@ -769,7 +769,7 @@ metatable::TerrainJson* MetaMgr::GetTerrainJson(int map_id)
return nullptr;
}
std::list<metatable::MapLayerJson>* MetaMgr::GetMapLayer(std::string& map_name)
std::list<metatable::MapLayerJson>* MetaMgr::GetMapLayer(const std::string& map_name)
{
auto itr = loader_->layer_meta_hash.find(map_name);
return itr != loader_->layer_meta_hash.end() ? &itr->second : nullptr;

4
server/gameserver/metamgr.h
View File

@ -31,9 +31,9 @@ class MetaMgr : public a8::Singleton<MetaMgr>
MetaData::Building* GetBuilding(int building_id);
MetaData::Drop* GetDrop(int drop_id);
MetaData::SafeArea* GetSafeArea(int area_id);
std::vector<MetaData::MapTplThing>* GetMapTplThing(std::string& map_name);
std::vector<MetaData::MapTplThing>* GetMapTplThing(const std::string& map_name);
metatable::TerrainJson* GetTerrainJson(int map_id);
std::list<metatable::MapLayerJson>* GetMapLayer(std::string& map_name);
std::list<metatable::MapLayerJson>* GetMapLayer(const std::string& map_name);
std::list<MetaData::AirDrop>& GetAirDrops();
MetaData::AirDrop* GetAirDrop(int airdrop_id);
MetaData::AirLine* RandAirLine(int map_id);