diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index e9c290d..67172d1 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -50,13 +50,6 @@ void Bullet::RecalcSelfCollider() self_collider_->rad = gun_meta->i->bullet_rad(); } -#ifdef RAY_DETECTION -void Bullet::RayDetection() -{ - -} -#endif - void Bullet::OnHit(std::set& objects) { for (auto& target : objects) { diff --git a/server/gameserver/bullet.h b/server/gameserver/bullet.h index 05caaa4..ebb4cfd 100644 --- a/server/gameserver/bullet.h +++ b/server/gameserver/bullet.h @@ -31,7 +31,6 @@ class Bullet : public Entity virtual void Initialize() override; virtual void Update(int delta_time) override; void RecalcSelfCollider(); - void RayDetection(); void ClearRayData(); private: diff --git a/server/gameserver/movement.cc b/server/gameserver/movement.cc index eee649d..8ad82d2 100644 --- a/server/gameserver/movement.cc +++ b/server/gameserver/movement.cc @@ -2,6 +2,11 @@ #include "movement.h" +void MovementComponent::RayDetection() +{ + +} + void MovementComponent::GetCollisionObjects(std::set& objects) { diff --git a/server/gameserver/movement.h b/server/gameserver/movement.h index c5c04d0..abeb2f3 100644 --- a/server/gameserver/movement.h +++ b/server/gameserver/movement.h @@ -9,6 +9,7 @@ class MovementComponent Vector2D target_point; std::set detection_objects; + void RayDetection(); void GetCollisionObjects(std::set& objects); bool TestCollision(); }; diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 4a55c2e..494f04f 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -21,6 +21,7 @@ #include "roommgr.h" #include "app.h" #include "hero.h" +#include "movement.h" const int ROOM_MAX_PLAYER_NUM = 50; @@ -605,7 +606,7 @@ void Room::CreateBullet(Human* hum, Weapon* weapon, AddObjectLater(bullet); grid_service.AddBullet(bullet); #ifdef RAY_DETECTION - bullet->RayDetection(); + bullet->movement->RayDetection(); #endif }