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-08-03 02:15:12 +00:00
parent b566739636
commit 9d388b8813
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/bullet.cc
View File

@ -367,6 +367,7 @@ void Bullet::Check(float distance)
{ {
int c_hit_num = 0; int c_hit_num = 0;
int t_hit_num = 0; int t_hit_num = 0;
int o_hit_num = 0;
std::set<Entity*> objects; std::set<Entity*> objects;
{ {
std::set<ColliderComponent*> colliders; std::set<ColliderComponent*> colliders;
@ -374,6 +375,7 @@ void Bullet::Check(float distance)
for (ColliderComponent* collider : colliders) { for (ColliderComponent* collider : colliders) {
if (collider->owner->IsEntityType(ET_Dummy)) { if (collider->owner->IsEntityType(ET_Dummy)) {
if (TestCollision(room, collider)) { if (TestCollision(room, collider)) {
++o_hit_num;
objects.insert(collider->owner); objects.insert(collider->owner);
} }
} else if (collider->owner->IsEntityType(ET_Obstacle)) { } else if (collider->owner->IsEntityType(ET_Obstacle)) {
@ -388,6 +390,7 @@ void Bullet::Check(float distance)
objects.insert(collider->owner); objects.insert(collider->owner);
if (gun_meta->i->is_penetrate_thing()) { if (gun_meta->i->is_penetrate_thing()) {
++t_hit_num; ++t_hit_num;
++o_hit_num;
hit_objects_.insert(collider->owner->GetUniId()); hit_objects_.insert(collider->owner->GetUniId());
} }
} }
@ -395,7 +398,7 @@ void Bullet::Check(float distance)
} }
} }
} }
if (t_hit_num <= 0) { if (o_hit_num <= 0) {
room->grid_service->TraverseCreatures room->grid_service->TraverseCreatures
(room->GetRoomIdx(), (room->GetRoomIdx(),
GetGridList(), GetGridList(),