From 6c41e6b2de680c50d7b48aa86e2e4a9554a55d03 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 28 Jun 2019 16:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=87=BD?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/gridservice.cc | 48 ++++---------------------------- server/gameserver/gridservice.h | 12 -------- 2 files changed, 6 insertions(+), 54 deletions(-) diff --git a/server/gameserver/gridservice.cc b/server/gameserver/gridservice.cc index 4a84a7d..c600db6 100644 --- a/server/gameserver/gridservice.cc +++ b/server/gameserver/gridservice.cc @@ -4,6 +4,12 @@ #include "human.h" #include "bullet.h" +/* + 1 2 3 + 4 5 6 + 7 8 9 + */ + GridService::GridService() { @@ -74,48 +80,6 @@ void GridService::GetAllCellsByXy(int x, int y, std::set& grid_list) GetAllCells(new_grid_id, grid_list); } -void GridService::Get123(int grid_id, std::set& grid_list) -{ - GetGridList(grid_id, 1, grid_list); - GetGridList(grid_id, 2, grid_list); - GetGridList(grid_id, 3, grid_list); -} - -void GridService::Get456(int grid_id, std::set& grid_list) -{ - GetGridList(grid_id, 4, grid_list); - GetGridList(grid_id, 5, grid_list); - GetGridList(grid_id, 6, grid_list); -} - -void GridService::Get789(int grid_id, std::set& grid_list) -{ - GetGridList(grid_id, 7, grid_list); - GetGridList(grid_id, 8, grid_list); - GetGridList(grid_id, 9, grid_list); -} - -void GridService::Get147(int grid_id, std::set& grid_list) -{ - GetGridList(grid_id, 1, grid_list); - GetGridList(grid_id, 4, grid_list); - GetGridList(grid_id, 7, grid_list); -} - -void GridService::Get258(int grid_id, std::set& grid_list) -{ - GetGridList(grid_id, 2, grid_list); - GetGridList(grid_id, 5, grid_list); - GetGridList(grid_id, 8, grid_list); -} - -void GridService::Get369(int grid_id, std::set& grid_list) -{ - GetGridList(grid_id, 3, grid_list); - GetGridList(grid_id, 6, grid_list); - GetGridList(grid_id, 9, grid_list); -} - void GridService::AddHuman(Human* hum) { int x = (int)hum->pos.x + cell_width_; diff --git a/server/gameserver/gridservice.h b/server/gameserver/gridservice.h index 2f12519..52510bf 100644 --- a/server/gameserver/gridservice.h +++ b/server/gameserver/gridservice.h @@ -11,11 +11,6 @@ struct GridCell std::set bullet_list; }; -/* - 1 2 3 - 4 5 6 - 7 8 9 - */ class Human; class Entity; class Room; @@ -47,13 +42,6 @@ class GridService void RemoveFromGridList(std::set& grid_list, Entity* entity); private: - void Get123(int grid_id, std::set& grid_list); - void Get456(int grid_id, std::set& grid_list); - void Get789(int grid_id, std::set& grid_list); - void Get147(int grid_id, std::set& grid_list); - void Get258(int grid_id, std::set& grid_list); - void Get369(int grid_id, std::set& grid_list); - inline void GetGridList(int grid_id, int offset, std::set& grid_list); void ComputeDiff(int old_grid_id, int new_grid_id,