diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-20 11:30:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 11:30:56 +0100 |
| commit | bd61281a5f515065b05be008dd3d6b73a03f5a7c (patch) | |
| tree | 0add52fc270f808b4b2ad0bf7c970d72338c667e /servers/physics_2d | |
| parent | 1a4be2cd8fdd9ba26f016f3e2d83febfe8ae141c (diff) | |
| parent | 69c95f4b4c128a22777af1e155bc24c7033decca (diff) | |
Merge pull request #36368 from reduz/variant-rework
Reworked signal system, added support for Callable and Signal
Diffstat (limited to 'servers/physics_2d')
| -rw-r--r-- | servers/physics_2d/area_2d_sw.cpp | 4 | ||||
| -rw-r--r-- | servers/physics_2d/body_2d_sw.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics_2d/area_2d_sw.cpp b/servers/physics_2d/area_2d_sw.cpp index c67d870b2a..45666d9d09 100644 --- a/servers/physics_2d/area_2d_sw.cpp +++ b/servers/physics_2d/area_2d_sw.cpp @@ -200,7 +200,7 @@ void Area2DSW::call_queries() { res[3] = E->key().body_shape; res[4] = E->key().area_shape; - Variant::CallError ce; + Callable::CallError ce; obj->call(monitor_callback_method, (const Variant **)resptr, 5, ce); } } @@ -232,7 +232,7 @@ void Area2DSW::call_queries() { res[3] = E->key().body_shape; res[4] = E->key().area_shape; - Variant::CallError ce; + Callable::CallError ce; obj->call(area_monitor_callback_method, (const Variant **)resptr, 5, ce); } } diff --git a/servers/physics_2d/body_2d_sw.cpp b/servers/physics_2d/body_2d_sw.cpp index 4de52cacbd..863b422996 100644 --- a/servers/physics_2d/body_2d_sw.cpp +++ b/servers/physics_2d/body_2d_sw.cpp @@ -612,7 +612,7 @@ void Body2DSW::call_queries() { set_force_integration_callback(ObjectID(), StringName()); } else { - Variant::CallError ce; + Callable::CallError ce; if (fi_callback->callback_udata.get_type() != Variant::NIL) { obj->call(fi_callback->method, vp, 2, ce); |