From fce401bbbe6a04aca55a423b97d4d3564b542e9c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 27 Mar 2023 19:29:24 +0800 Subject: [PATCH] 1 --- server/gameserver/mapcollider.cc | 2 -- server/gameserver/mapcollider.h | 1 + server/gameserver/mt/MapCollider.cc | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/gameserver/mapcollider.cc b/server/gameserver/mapcollider.cc index b19f8f16..00ce619b 100644 --- a/server/gameserver/mapcollider.cc +++ b/server/gameserver/mapcollider.cc @@ -4,8 +4,6 @@ #include "mapcollider.h" -static const float MAP_SCALE = 10; - namespace mc { diff --git a/server/gameserver/mapcollider.h b/server/gameserver/mapcollider.h index 766f1892..40b87c47 100644 --- a/server/gameserver/mapcollider.h +++ b/server/gameserver/mapcollider.h @@ -6,6 +6,7 @@ namespace mc { + const float MAP_SCALE = 10; enum ColliderType_e { diff --git a/server/gameserver/mt/MapCollider.cc b/server/gameserver/mt/MapCollider.cc index ee2524ec..bdb640e8 100644 --- a/server/gameserver/mt/MapCollider.cc +++ b/server/gameserver/mt/MapCollider.cc @@ -87,6 +87,7 @@ namespace mt } { mc::MeshCollider* mesh = new mc::MeshCollider(); + mesh->type = mc::kMeshCollider; for (auto v : verts_pb.vectors()) { mesh->mesh.vertices.push_back (