diff options
| author | Josh Jones <kilauea.jones@gmail.com> | 2023-01-27 20:15:10 -0800 |
|---|---|---|
| committer | Josh Jones <kilauea.jones@gmail.com> | 2023-01-27 23:14:36 -0800 |
| commit | 22f9ef19e1accd5d5e36ce30589ba3edd5c3d0d0 (patch) | |
| tree | 5cac93ecc341df5c1c85494d500bf6fa84a26cd5 /modules/navigation/godot_navigation_server.h | |
| parent | a43db5afa4bbec4772be2f296931a6d44bb4cbb3 (diff) | |
Use Callable for Navigation Agent callbacks
Diffstat (limited to 'modules/navigation/godot_navigation_server.h')
| -rw-r--r-- | modules/navigation/godot_navigation_server.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/modules/navigation/godot_navigation_server.h b/modules/navigation/godot_navigation_server.h index efefa60de8..eea5713c40 100644 --- a/modules/navigation/godot_navigation_server.h +++ b/modules/navigation/godot_navigation_server.h @@ -54,10 +54,6 @@ virtual void F_NAME(T_0 D_0, T_1 D_1) override; \ void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1) -#define COMMAND_4_DEF(F_NAME, T_0, D_0, T_1, D_1, T_2, D_2, T_3, D_3, D_3_DEF) \ - virtual void F_NAME(T_0 D_0, T_1 D_1, T_2 D_2, T_3 D_3 = D_3_DEF) override; \ - void MERGE(_cmd_, F_NAME)(T_0 D_0, T_1 D_1, T_2 D_2, T_3 D_3) - class GodotNavigationServer; struct SetCommand { @@ -182,7 +178,7 @@ public: COMMAND_2(agent_set_position, RID, p_agent, Vector3, p_position); COMMAND_2(agent_set_ignore_y, RID, p_agent, bool, p_ignore); virtual bool agent_is_map_changed(RID p_agent) const override; - COMMAND_4_DEF(agent_set_callback, RID, p_agent, ObjectID, p_object_id, StringName, p_method, Variant, p_udata, Variant()); + COMMAND_2(agent_set_callback, RID, p_agent, Callable, p_callback); COMMAND_1(free, RID, p_object); @@ -198,6 +194,5 @@ public: #undef COMMAND_1 #undef COMMAND_2 -#undef COMMAND_4_DEF #endif // GODOT_NAVIGATION_SERVER_H |