修复子弹飞出边界问题

This commit is contained in:
aozhiwei 2019-04-29 20:34:59 +08:00
parent da524cb21f
commit bec0056f2b

View File

@ -26,7 +26,6 @@ void Bullet::Update(int delta_time)
{ {
pos = pos + dir * gun_meta->i->bullet_speed() / 20.0f; pos = pos + dir * gun_meta->i->bullet_speed() / 20.0f;
float distance = (pos - born_pos).Norm(); float distance = (pos - born_pos).Norm();
room->grid_service.MoveBullet(this);
if (room->OverBorder(pos, gun_meta->i->bullet_rad())) { if (room->OverBorder(pos, gun_meta->i->bullet_rad())) {
if (IsBomb()){ if (IsBomb()){
ProcBomb(); ProcBomb();
@ -34,6 +33,7 @@ void Bullet::Update(int delta_time)
room->RemoveObjectLater(this); room->RemoveObjectLater(this);
} }
} else { } else {
room->grid_service.MoveBullet(this);
std::set<Entity*> objects; std::set<Entity*> objects;
for (auto& grid : grid_list) { for (auto& grid : grid_list) {
for (Human* hum: grid->human_list) { for (Human* hum: grid->human_list) {