diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-22 08:37:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 08:37:44 +0100 |
| commit | ae7866c8631bb7717c10d7a475b043a60c9d75cc (patch) | |
| tree | bed29f7a7ad5ab6b991cbce7f85403aca1d955b4 | |
| parent | d6f21bfb614177ef8278d8741b97f1ab6434af43 (diff) | |
| parent | 826ea43af6446f4f2ce3f9dc7464a0a320052ed9 (diff) | |
Merge pull request #55180 from madmiraal/fix-42711
| -rw-r--r-- | modules/bullet/area_bullet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/bullet/area_bullet.cpp b/modules/bullet/area_bullet.cpp index 1c49029570..435069e25c 100644 --- a/modules/bullet/area_bullet.cpp +++ b/modules/bullet/area_bullet.cpp @@ -92,8 +92,8 @@ void AreaBullet::dispatch_callbacks() { overlapping_shapes.remove(i); // Remove after callback break; case OVERLAP_STATE_INSIDE: { - if (otherObj.object->getType() == TYPE_RIGID_BODY) { - RigidBodyBullet *body = static_cast<RigidBodyBullet *>(otherObj.object); + if (overlapping_shape.other_object->getType() == TYPE_RIGID_BODY) { + RigidBodyBullet *body = static_cast<RigidBodyBullet *>(overlapping_shape.other_object); body->scratch_space_override_modificator(); } break; @@ -276,7 +276,7 @@ void AreaBullet::set_param(PhysicsServer3D::AreaParameter p_param, const Variant default: WARN_PRINT("Area doesn't support this parameter in the Bullet backend: " + itos(p_param)); } - scratch(); + isScratched = true; } Variant AreaBullet::get_param(PhysicsServer3D::AreaParameter p_param) const { @@ -312,7 +312,7 @@ void AreaBullet::set_event_callback(Type p_callbackObjectType, const Callable &p set_godot_object_flags(get_godot_object_flags() | GOF_IS_MONITORING_AREA); } else { set_godot_object_flags(get_godot_object_flags() & (~GOF_IS_MONITORING_AREA)); - clear_overlaps(true); + clear_overlaps(); } } |