godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Merge pull request #55180 from madmiraal/fix-42711

Browse Source
This commit is contained in:
Rémi Verschelde
2021-11-22 08:37:44 +01:00
committed by GitHub
parent d6f21bfb61 826ea43af6
commit ae7866c863
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/bullet/area_bullet.cpp
View File

@@ -92,8 +92,8 @@ void AreaBullet::dispatch_callbacks() {
overlapping_shapes.remove(i); // Remove after callback overlapping_shapes.remove(i); // Remove after callback
break; break;
case OVERLAP_STATE_INSIDE: { case OVERLAP_STATE_INSIDE: {
if (otherObj.object->getType() == TYPE_RIGID_BODY) { if (overlapping_shape.other_object->getType() == TYPE_RIGID_BODY) {
RigidBodyBullet *body = static_cast<RigidBodyBullet *>(otherObj.object); RigidBodyBullet *body = static_cast<RigidBodyBullet *>(overlapping_shape.other_object);
body->scratch_space_override_modificator(); body->scratch_space_override_modificator();
} }
break; break;
@@ -276,7 +276,7 @@ void AreaBullet::set_param(PhysicsServer3D::AreaParameter p_param, const Variant
default: default:
WARN_PRINT("Area doesn't support this parameter in the Bullet backend: " + itos(p_param)); 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 { 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); set_godot_object_flags(get_godot_object_flags() | GOF_IS_MONITORING_AREA);
} else { } else {
set_godot_object_flags(get_godot_object_flags() & (~GOF_IS_MONITORING_AREA)); set_godot_object_flags(get_godot_object_flags() & (~GOF_IS_MONITORING_AREA));
clear_overlaps(true); clear_overlaps();
} }
} }