From 0830650add46ea656ac92c14a9a6fdeedd207c41 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 29 Nov 2022 14:00:51 +0800 Subject: [PATCH] 1 --- server/gameserver/mapinstance.cc | 13 +++++++------ server/gameserver/mapinstance.h | 5 +---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/server/gameserver/mapinstance.cc b/server/gameserver/mapinstance.cc index 5559003b..a52c3f2d 100644 --- a/server/gameserver/mapinstance.cc +++ b/server/gameserver/mapinstance.cc @@ -37,8 +37,8 @@ struct NavMeshSetHeader struct NavMeshTileHeader { - dtTileRef tileRef; - int dataSize; + dtTileRef tileRef; + int dataSize; }; void MapInstance::Init() @@ -652,10 +652,7 @@ int MapInstance::FindRandomPointAroundCircle(int layer, return 0; } -int MapInstance::Raycast(int layer, - const a8::Vec3& start, - const a8::Vec3& end, - std::vector& hit_points) +int MapInstance::Raycast(int layer, const a8::Vec3& start, const a8::Vec3& end, a8::Vec3& hit_point) { float hitPoint[3]; @@ -706,5 +703,9 @@ int MapInstance::Raycast(int layer, } } + hit_point.x = hitPoint[0]; + hit_point.y = hitPoint[1]; + hit_point.z = hitPoint[2]; + return 1; } diff --git a/server/gameserver/mapinstance.h b/server/gameserver/mapinstance.h index 6dfe0597..3dd8bc52 100644 --- a/server/gameserver/mapinstance.h +++ b/server/gameserver/mapinstance.h @@ -49,10 +49,7 @@ class MapInstance std::vector& points, unsigned int max_points, float max_radius); - int Raycast(int layer, - const a8::Vec3& start, - const a8::Vec3& end, - std::vector& hit_points); + int Raycast(int layer, const a8::Vec3& start, const a8::Vec3& end, a8::Vec3& hit_point); private: void CreateThings();