summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-01-08 12:01:31 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-01-08 12:01:31 +0100
commit4ca33d318bcd3e691b1ad70649ddcdf7731f5559 (patch)
treea48d253ad33a0c87f2df5a193b21430f12ecad2c
parent07f5dac81af1eb8bb7809249ef9306f67466690b (diff)
parent0517000e6fd8a325e14d8790dab8b9aa83522c4c (diff)
downloadredot-engine-4ca33d318bcd3e691b1ad70649ddcdf7731f5559.tar.gz
Merge pull request #86908 from AdSkipper1337/collision-object-2d-gdextension-virtuals
Fix virtual calls for GDExtension in `CollisionObject2D`
-rw-r--r--scene/2d/collision_object_2d.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp
index 2fbe4eb409..4e5852984b 100644
--- a/scene/2d/collision_object_2d.cpp
+++ b/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() {
- if (get_script_instance()) {
- get_script_instance()->call(SceneStringNames::get_singleton()->_mouse_enter);
- }
+ GDVIRTUAL_CALL(_mouse_enter);
emit_signal(SceneStringNames::get_singleton()->mouse_entered);
}
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);
}
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);
}
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);
}