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 18:36:46 +08:00
parent 2990a44ca2
commit 564e639edc
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -120,7 +120,9 @@ 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;

12
server/gameserver/gridservice.cc
View File

@ -125,6 +125,12 @@ void GridService::MoveHuman(Human* hum)
int new_x = (int)hum->pos.x + cell_width_; int new_x = (int)hum->pos.x + cell_width_;
int new_y = (int)hum->pos.y + cell_width_; int new_y = (int)hum->pos.y + cell_width_;
int new_grid_id = new_x/cell_width_ + (new_y/cell_width_) * cell_count_per_row_; int new_grid_id = new_x/cell_width_ + (new_y/cell_width_) * cell_count_per_row_;
if (BroderOverFlow(new_x, new_y)) {
abort();
}
if (new_grid_id == 0 || new_grid_id > max_grid_id_) {
abort();
}
if (new_grid_id != hum->grid_id) { if (new_grid_id != hum->grid_id) {
std::set<GridCell*> inc_grid_list; std::set<GridCell*> inc_grid_list;
std::set<GridCell*> dec_grid_list; std::set<GridCell*> dec_grid_list;
@ -160,6 +166,12 @@ void GridService::MoveBullet(Bullet* bullet)
int new_x = (int)bullet->pos.x + cell_width_; int new_x = (int)bullet->pos.x + cell_width_;
int new_y = (int)bullet->pos.y + cell_width_; int new_y = (int)bullet->pos.y + cell_width_;
int new_grid_id = new_x/cell_width_ + (new_y/cell_width_) * cell_count_per_row_; int new_grid_id = new_x/cell_width_ + (new_y/cell_width_) * cell_count_per_row_;
if (BroderOverFlow(new_x, new_y)) {
abort();
}
if (new_grid_id == 0 || new_grid_id > max_grid_id_) {
abort();
}
if (new_grid_id != bullet->grid_id) { if (new_grid_id != bullet->grid_id) {
std::set<GridCell*> inc_grid_list; std::set<GridCell*> inc_grid_list;
std::set<GridCell*> dec_grid_list; std::set<GridCell*> dec_grid_list;