diff --git a/server/gameserver/collision.cc b/server/gameserver/collision.cc index cb131ddb..7629f478 100644 --- a/server/gameserver/collision.cc +++ b/server/gameserver/collision.cc @@ -36,6 +36,11 @@ bool Collision::CheckCB(Creature* c, Obstacle* b) return false; } +bool Collision::CheckCB(Creature* c, float c_radius, Obstacle* b, float b_radius) +{ + return false; +} + static float TwoDistance(float x1, float y1, float x2, float y2) { return pow(pow((x1 - x2), 2.0f) + pow((y1 - y2), 2.0f), 0.5); diff --git a/server/gameserver/collision.h b/server/gameserver/collision.h index 7aae6c25..9379f409 100644 --- a/server/gameserver/collision.h +++ b/server/gameserver/collision.h @@ -12,6 +12,7 @@ class Collision static bool CheckCC(Creature* a, Creature* b); static bool CheckCC(Creature* a, float radius, Creature* b, float radis); static bool CheckCB(Creature* c, Obstacle* b); + static bool CheckCB(Creature* c, float c_radius, Obstacle* b, float b_radius); /* --圆与旋转矩形碰撞 diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index f25d9e4e..fb52ec03 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -494,7 +494,7 @@ void RoomObstacle::SummonAirDropBox(int box_id) Position born_pos = GetPos(); const mt::MapThing* thing_meta = mt::MapThing::GetById(box_id); if (thing_meta && thing_meta->summon_born_rad() > 0) { - glm::vec3 born_dir = Glmhelper::UP; + glm::vec3 born_dir = GlmHelper::UP; GlmHelper::RotateY(born_dir, GetUniId()); // 999 #if 1