From 0119ab55561ed67d958df55d68270cf925283539 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 25 Apr 2019 19:21:08 +0800 Subject: [PATCH] 1 --- server/gameserver/bullet.cc | 2 -- server/gameserver/human.cc | 2 ++ server/gameserver/human.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 81f2b24..dd8fd8c 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -120,9 +120,7 @@ void Bullet::OnHit(std::set& objects) obstacle->ClearColliders(); room->ScatterDrop(obstacle->pos, obstacle->meta->i->drop()); } - #if 0 obstacle->BroadcastFullState(); - #endif } } break; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 2ac96fb..52e29cf 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -714,6 +714,7 @@ void Human::OnGridListChange(std::set& old_grid_list, } } } + #if 0 for (GridCell* cell : dec_grid_list) { for (Human* entity : cell->human_list) { if (!room->grid_service.HumanInGridList(entity, grid_list)) { @@ -737,6 +738,7 @@ void Human::OnGridListChange(std::set& old_grid_list, } } } + #endif } void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data) diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 242c04b..9c9e564 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -139,6 +139,7 @@ protected: std::vector bullets_; std::vector smokes_; std::vector explosions_; + std::list observers_; private: CircleCollider* self_collider_ = nullptr;