diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 5eb8a36..ba259f2 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -106,7 +106,6 @@ void Bullet::OnHit(std::set& objects) #ifdef RAY_DETECTION if (!obstacle->observer_set.empty()) { for (Bullet* bullet : obstacle->observer_set) { - bullet->touch_object = nullptr; bullet->RayDetection(); } obstacle->observer_set.clear(); @@ -245,10 +244,6 @@ void Bullet::RayDetectionUpdate() void Bullet::ClearRayData() { #ifdef RAY_DETECTION - if (touch_object) { - touch_object->observer_set.erae(this); - touch_object = nullptr; - } #endif } diff --git a/server/gameserver/bullet.h b/server/gameserver/bullet.h index 3910df8..bef7760 100644 --- a/server/gameserver/bullet.h +++ b/server/gameserver/bullet.h @@ -26,7 +26,6 @@ class Bullet : public Entity #ifdef RAY_DETECTION float target_distance = 0.0f; Vector2D target_point; - Obstacle* touch_object = nullptr; #endif Bullet(); diff --git a/server/gameserver/obstacle.h b/server/gameserver/obstacle.h index 10123fe..13f4a7b 100644 --- a/server/gameserver/obstacle.h +++ b/server/gameserver/obstacle.h @@ -36,9 +36,6 @@ class Obstacle : public Entity int door_house_uniid = 0; const metatable::DoorObjJson* door_state0 = nullptr; const metatable::DoorObjJson* door_state1 = nullptr; -#ifdef RAY_DETECTION - std::set observer_set; -#endif Obstacle(); virtual ~Obstacle() override;