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-25 13:31:59 +08:00
parent 829b72261c
commit 6d9f77e14f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/metamgr.cc
View File

@ -76,7 +76,7 @@ public:
std::map<int, MetaData::Building*> building_hash; std::map<int, MetaData::Building*> building_hash;
std::map<int, MetaData::Drop*> drop_hash; std::map<int, MetaData::Drop*> drop_hash;
std::map<std::string, std::list<metatable::MapTplThingJson>> maptpl_meta_hash; std::map<std::string, std::list<metatable::MapTplThingJson>> maptpl_meta_hash;
std::map<std::string, std::list<metatable::TerrainJson>> terrain_meta_hash; std::map<int, metatable::TerrainJson> terrain_meta_hash;
std::map<std::string, std::list<metatable::MapLayerJson>> layer_meta_hash; std::map<std::string, std::list<metatable::MapLayerJson>> layer_meta_hash;
std::map<std::string, std::vector<MetaData::MapTplThing>> maptpl_hash; std::map<std::string, std::vector<MetaData::MapTplThing>> maptpl_hash;
std::map<int, MetaData::Dress*> dress_hash; std::map<int, MetaData::Dress*> dress_hash;
@ -740,9 +740,9 @@ std::vector<MetaData::MapTplThing>* MetaMgr::GetMapTplThing(std::string& map_nam
return itr != loader_->maptpl_hash.end() ? &itr->second : nullptr; return itr != loader_->maptpl_hash.end() ? &itr->second : nullptr;
} }
std::list<metatable::TerrainJson>* MetaMgr::GetTerrainJson(std::string& map_name) metatable::TerrainJson* MetaMgr::GetTerrainJson(int map_id)
{ {
auto itr = loader_->terrain_meta_hash.find(map_name); auto itr = loader_->terrain_meta_hash.find(map_id);
return itr != loader_->terrain_meta_hash.end() ? &itr->second : nullptr; return itr != loader_->terrain_meta_hash.end() ? &itr->second : nullptr;
} }

2
server/gameserver/metamgr.h
View File

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