Browse Source

Merge pull request #86908 from AdSkipper1337/collision-object-2d-gdextension-virtuals

Fix virtual calls for GDExtension in `CollisionObject2D`
Rémi Verschelde 1 year ago
parent
commit
4ca33d318b
1 changed files with 4 additions and 12 deletions
  1. 4 12
      scene/2d/collision_object_2d.cpp

+ 4 - 12
scene/2d/collision_object_2d.cpp

@@ -523,30 +523,22 @@ void CollisionObject2D::_input_event_call(Viewport *p_viewport, const Ref<InputE
 }
 }
 
 
 void CollisionObject2D::_mouse_enter() {
 void CollisionObject2D::_mouse_enter() {
-	if (get_script_instance()) {
-		get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_enter);
-	}
+	GDVIRTUAL_CALL(_mouse_enter);
 	emit_signal(SceneStringNames::get_singleton()->mouse_entered);
 	emit_signal(SceneStringNames::get_singleton()->mouse_entered);
 }
 }
 
 
 void CollisionObject2D::_mouse_exit() {
 void CollisionObject2D::_mouse_exit() {
-	if (get_script_instance()) {
-		get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_exit);
-	}
+	GDVIRTUAL_CALL(_mouse_exit);
 	emit_signal(SceneStringNames::get_singleton()->mouse_exited);
 	emit_signal(SceneStringNames::get_singleton()->mouse_exited);
 }
 }
 
 
 void CollisionObject2D::_mouse_shape_enter(int p_shape) {
 void CollisionObject2D::_mouse_shape_enter(int p_shape) {
-	if (get_script_instance()) {
-		get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_shape_enter, p_shape);
-	}
+	GDVIRTUAL_CALL(_mouse_shape_enter, p_shape);
 	emit_signal(SceneStringNames::get_singleton()->mouse_shape_entered, p_shape);
 	emit_signal(SceneStringNames::get_singleton()->mouse_shape_entered, p_shape);
 }
 }
 
 
 void CollisionObject2D::_mouse_shape_exit(int p_shape) {
 void CollisionObject2D::_mouse_shape_exit(int p_shape) {
-	if (get_script_instance()) {
-		get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_shape_exit, p_shape);
-	}
+	GDVIRTUAL_CALL(_mouse_shape_exit, p_shape);
 	emit_signal(SceneStringNames::get_singleton()->mouse_shape_exited, p_shape);
 	emit_signal(SceneStringNames::get_singleton()->mouse_shape_exited, p_shape);
 }
 }