diff --git a/server/gameserver/mapcollider.cc b/server/gameserver/mapcollider.cc index d9b24012..edb1e221 100644 --- a/server/gameserver/mapcollider.cc +++ b/server/gameserver/mapcollider.cc @@ -126,7 +126,7 @@ namespace mc { node->name }); - childs[node->name] = node; + childs[a8::Format("%s_%d", {node->name, i + 1})] = node; #else A8_ABORT(); #endif diff --git a/server/gameserver/mapservice.cc b/server/gameserver/mapservice.cc index 78f94abe..f5fb003c 100644 --- a/server/gameserver/mapservice.cc +++ b/server/gameserver/mapservice.cc @@ -196,7 +196,9 @@ void MapService::AddTriangle(mc::Triangle* tri) //A8_ABORT(); } if (max_grid_y >= map_height_) { + #if 0 A8_ABORT(); + #endif max_grid_y = map_height_ - 1; } float tri_verts[3 * 3]; diff --git a/server/gameserver/mt/MapCollider.cc b/server/gameserver/mt/MapCollider.cc index 1c81ec72..945b2767 100644 --- a/server/gameserver/mt/MapCollider.cc +++ b/server/gameserver/mt/MapCollider.cc @@ -29,14 +29,22 @@ namespace mt void MapCollider::LoadAll() { std::vector files = { +#ifdef DEBUG + "main3d_map.colliders.new.json" +#else "main3d_map.colliders.json" +#endif }; for (auto& filename : files) { MapCollider* p = new MapCollider(); p->Load(filename); p->LoadTerrain("map4_terrain.bin"); raw_list.push_back(p); +#ifdef DEBUG + name_hash["main3d_map.colliders.json"] = p; +#else name_hash[filename] = p; +#endif } }