server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-04-25 19:21:08 +08:00
parent 564e639edc
commit 0119ab5556
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -120,9 +120,7 @@ void Bullet::OnHit(std::set<Entity*>& objects)
obstacle->ClearColliders(); obstacle->ClearColliders();
room->ScatterDrop(obstacle->pos, obstacle->meta->i->drop()); room->ScatterDrop(obstacle->pos, obstacle->meta->i->drop());
} }
#if 0
obstacle->BroadcastFullState(); obstacle->BroadcastFullState();
#endif
} }
} }
break; break;

2
server/gameserver/human.cc
View File

@ -714,6 +714,7 @@ void Human::OnGridListChange(std::set<GridCell*>& old_grid_list,
} }
} }
} }
#if 0
for (GridCell* cell : dec_grid_list) { for (GridCell* cell : dec_grid_list) {
for (Human* entity : cell->human_list) { for (Human* entity : cell->human_list) {
if (!room->grid_service.HumanInGridList(entity, grid_list)) { if (!room->grid_service.HumanInGridList(entity, grid_list)) {
@ -737,6 +738,7 @@ void Human::OnGridListChange(std::set<GridCell*>& old_grid_list,
} }
} }
} }
#endif
} }
void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data) void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)

1
server/gameserver/human.h
View File

@ -139,6 +139,7 @@ protected:
std::vector<int> bullets_; std::vector<int> bullets_;
std::vector<int> smokes_; std::vector<int> smokes_;
std::vector<int> explosions_; std::vector<int> explosions_;
std::list<Human*> observers_;
private: private:
CircleCollider* self_collider_ = nullptr; CircleCollider* self_collider_ = nullptr;