diff --git a/server/gameserver/metamgr.cc b/server/gameserver/metamgr.cc index 59274df..47fa777 100755 --- a/server/gameserver/metamgr.cc +++ b/server/gameserver/metamgr.cc @@ -76,7 +76,7 @@ public: std::map building_hash; std::map drop_hash; std::map> maptpl_meta_hash; - std::map> terrain_meta_hash; + std::map terrain_meta_hash; std::map> layer_meta_hash; std::map> maptpl_hash; std::map dress_hash; @@ -740,9 +740,9 @@ std::vector* MetaMgr::GetMapTplThing(std::string& map_nam return itr != loader_->maptpl_hash.end() ? &itr->second : nullptr; } -std::list* 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; } diff --git a/server/gameserver/metamgr.h b/server/gameserver/metamgr.h index 5960f57..779bf89 100755 --- a/server/gameserver/metamgr.h +++ b/server/gameserver/metamgr.h @@ -32,7 +32,7 @@ class MetaMgr : public a8::Singleton MetaData::Drop* GetDrop(int drop_id); MetaData::SafeArea* GetSafeArea(int area_id); std::vector* GetMapTplThing(std::string& map_name); - std::list* GetTerrainJson(std::string& map_name); + metatable::TerrainJson* GetTerrainJson(int map_id); std::list* GetMapLayer(std::string& map_name); std::list& GetAirDrops(); MetaData::AirDrop* GetAirDrop(int airdrop_id);