diff --git a/server/gameserver/mapcollider.cc b/server/gameserver/mapcollider.cc index b2db04c7..f394f21b 100644 --- a/server/gameserver/mapcollider.cc +++ b/server/gameserver/mapcollider.cc @@ -90,7 +90,7 @@ namespace mc switch (collider_union_xobj->At("type")->AsXValue().GetInt()) { case kBoxCollider: { - std::shared_ptr c = std::make_shared(); + auto c = std::make_shared(); c->type = kBoxCollider; c->Read(collider_union_xobj->At("box")); colliders.push_back(c); @@ -98,7 +98,7 @@ namespace mc break; case kMeshCollider: { - std::shared_ptr c = std::make_shared(); + auto c = std::make_shared(); c->type = kMeshCollider; c->Read(collider_union_xobj->At("mesh")); colliders.push_back(c); @@ -115,7 +115,7 @@ namespace mc { auto childs_arr = xobj->At("childs"); for (int i = 0; i < childs_arr->Size(); ++i) { - std::shared_ptr node = std::make_shared(); + auto node = std::make_shared(); node->parent = this; node->Read(childs_arr->At(i)); if (childs.find(node->name) != childs.end()) { diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc index 4e116afc..b780997c 100644 --- a/server/gameserver/mapinstance.cc +++ b/server/gameserver/mapinstance.cc @@ -930,7 +930,7 @@ void MapInstance::LoadHouse() }//end for i } else if (c->type == mc::kBoxCollider) { mc::BoxCollider* box_collider = (mc::BoxCollider*)c.get(); -#if 0 + #if 0 if (node->name == "Wall2_1 (18)") { printf("node->name %s %f,%f,%f %f,%f,%f\n", node->name.c_str(), diff --git a/server/gameserver/mt/Map.h b/server/gameserver/mt/Map.h index c40bad77..06a3597c 100644 --- a/server/gameserver/mt/Map.h +++ b/server/gameserver/mt/Map.h @@ -36,7 +36,7 @@ namespace mt std::vector> _world_objects; std::shared_ptr collider_info; std::map>> _group_world_objects; - MapCollider* collider_info = nullptr; + std::shared_ptr collider_info = nullptr; std::vector, int>> moba_born_points; std::vector, int>>> moba_path_points; diff --git a/server/gameserver/mt/MapCollider.cc b/server/gameserver/mt/MapCollider.cc index 587fa3e3..16525608 100644 --- a/server/gameserver/mt/MapCollider.cc +++ b/server/gameserver/mt/MapCollider.cc @@ -49,7 +49,7 @@ namespace mt auto xobj_nodes = xobj_root.At("nodes"); for (int i = 0; i < xobj_nodes->Size(); ++i) { auto xobj_node = xobj_nodes->At(i); - std::shared_ptr node = std::make_shared(); + auto node = std::make_shared(); node->Read(xobj_node); if (nodes_.find(node->name) != nodes_.end()) { abort(); @@ -82,13 +82,13 @@ namespace mt abort(); } const std::string terrain_name = "_terrain_"; - std::shared_ptr node = std::make_shared(); + auto node = std::make_shared(); node->name = terrain_name; if (nodes_.find(node->name) != nodes_.end()) { abort(); } { - std::shared_ptr mesh = std::make_shared(); + auto mesh = std::make_shared(); mesh->type = mc::kMeshCollider; mesh->ca_type = mc::kCA_Surface; mesh->mesh.vertices.reserve(verts_pb.vectors().size());