From e3c42618b9f370abd859111e7e4452ae790ece11 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 15 Dec 2023 13:19:42 +0800 Subject: [PATCH] 1 --- server/gameserver/bullet.cc | 3 +-- server/gameserver/bullet.h | 2 +- server/gameserver/player.cc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 9b082d09..6b2dd390 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -1145,8 +1145,7 @@ bool Bullet::NoAdjustPos() return false; } - -void Bullet::ReportHookHitPos(const glm::vec3& hit_pos) +void Bullet::ReportHookHitPos(int hit_obj_uniid, const glm::vec3& hit_pos) { if (later_removed_) { return; diff --git a/server/gameserver/bullet.h b/server/gameserver/bullet.h index b59e2f9d..b5e8623e 100644 --- a/server/gameserver/bullet.h +++ b/server/gameserver/bullet.h @@ -62,7 +62,7 @@ class Bullet : public MoveableEntity, public IBullet virtual const Position& GetPos() override; virtual void ProcRequestBulletDmg(int shield_hit, int strength_wall_uniid, int target_uniid, const glm::vec3& pos) override; - void ReportHookHitPos(const glm::vec3& hit_pos); + void ReportHookHitPos(int hit_obj_uniid, const glm::vec3& hit_pos); protected: Bullet(); diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index d8a95a2b..b9a87ad3 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1821,7 +1821,7 @@ void Player::_CMReportHookHitPos(f8::MsgHdr* hdr, const cs::CMReportHookHitPos& Bullet* b = (Bullet*)e; glm::vec3 hit_pos; TypeConvert::FromPb(hit_pos, &msg.pos()); - b->ReportHookHitPos(hit_pos); + b->ReportHookHitPos(msg.hit_obj_uniid(), hit_pos); } }