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

1

Browse Source
This commit is contained in:
aozhiwei 2021-07-16 16:27:55 +08:00
parent 39e7f5f6f6
commit e666cd558b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/gameserver/bullet.cc
View File

@ -362,12 +362,18 @@ void Bullet::Check(float distance)
if (c != sender.Get() && !c->dead && TestCollision(room, &aabb_box)) { if (c != sender.Get() && !c->dead && TestCollision(room, &aabb_box)) {
if (meta->i->_inventory_slot() == IS_C4) { if (meta->i->_inventory_slot() == IS_C4) {
if (!c->IsHuman()) { if (!c->IsHuman()) {
++c_hit_num;
objects.insert(c); objects.insert(c);
if (gun_meta->i->ispenetrate()) {
++c_hit_num;
hit_objects_.insert(c->GetUniId());
}
} }
} else { } else {
++c_hit_num;
objects.insert(c); objects.insert(c);
if (gun_meta->i->ispenetrate()) {
++c_hit_num;
hit_objects_.insert(c->GetUniId());
}
} }
} }
} }
@ -385,8 +391,11 @@ void Bullet::Check(float distance)
} }
if (!obstacle->CanThroughable(this)) { if (!obstacle->CanThroughable(this)) {
if (TestCollision(room, collider)) { if (TestCollision(room, collider)) {
++t_hit_num;
objects.insert(collider->owner); objects.insert(collider->owner);
if (gun_meta->i->is_penetrate_thing()) {
++t_hit_num;
hit_objects_.insert(collider->owner->GetUniId());
}
} }
} }
} }