From f1099980ede232fb2190378f8ee8abc849a87190 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 8 Jun 2021 10:56:04 +0800 Subject: [PATCH] 1 --- server/gameserver/moveableentity.cc | 10 ---------- server/gameserver/moveableentity.h | 6 ++---- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/server/gameserver/moveableentity.cc b/server/gameserver/moveableentity.cc index 2a59b86..a001582 100644 --- a/server/gameserver/moveableentity.cc +++ b/server/gameserver/moveableentity.cc @@ -3,16 +3,6 @@ #include "room.h" #include "human.h" -void MoveableEntity::TraverseLayer0EntityList(std::function func) -{ - room->grid_service->TraverseLayer0EntityList(grid_list_, func); -} - -void MoveableEntity::TraverseLayer1EntityList(std::function func) -{ - room->grid_service->TraverseLayer1EntityList(room->GetRoomIdx(), grid_list_, func); -} - void MoveableEntity::TraverseAllLayerEntityList(std::function func) { room->grid_service->TraverseAllLayerEntityList(room->GetRoomIdx(), grid_list_, func); diff --git a/server/gameserver/moveableentity.h b/server/gameserver/moveableentity.h index e669304..6919f9d 100644 --- a/server/gameserver/moveableentity.h +++ b/server/gameserver/moveableentity.h @@ -13,8 +13,6 @@ class MoveableEntity : public RoomEntity int UpdatedTimes() { return updated_times_;} std::set& GetGridList() { return grid_list_; } - void TraverseLayer0EntityList(std::function func); - void TraverseLayer1EntityList(std::function func); void TraverseAllLayerEntityList(std::function func); void TraverseAllLayerHumanList(std::function func); @@ -31,9 +29,9 @@ class MoveableEntity : public RoomEntity protected: int updated_times_ = 0; - a8::Vec2 move_dir_; - a8::Vec2 attack_dir_; private: + a8::Vec2 move_dir_; + a8::Vec2 attack_dir_; std::set grid_list_; };