diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-18 16:39:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 16:39:40 +0200 |
| commit | 38250ef54e439d69240f4b514f3bacb05b5d8c12 (patch) | |
| tree | d2c756a93b723f424622f83fbb1b6368ff6d01aa /modules/gdnative/nativescript/godot_nativescript.cpp | |
| parent | 5ee340ab4c6e8e644e90e6cf1c54d592574a44b7 (diff) | |
| parent | 74eecd1d6bd00a239b54bfc47d6ea5cb3de0fa63 (diff) | |
| download | redot-engine-38250ef54e439d69240f4b514f3bacb05b5d8c12.tar.gz | |
Merge pull request #38826 from bruvzg/gdnative_core_types
Add new (and rename changed) core types to GDNative API.
Diffstat (limited to 'modules/gdnative/nativescript/godot_nativescript.cpp')
| -rw-r--r-- | modules/gdnative/nativescript/godot_nativescript.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdnative/nativescript/godot_nativescript.cpp b/modules/gdnative/nativescript/godot_nativescript.cpp index 1bdac0dcb2..1aea8ad160 100644 --- a/modules/gdnative/nativescript/godot_nativescript.cpp +++ b/modules/gdnative/nativescript/godot_nativescript.cpp @@ -159,7 +159,7 @@ void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const c E->get().properties.insert(p_path, property); } -void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_signal *p_signal) { +void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_nativescript_signal *p_signal) { String *s = (String *)p_gdnative_handle; Map<StringName, NativeScriptDesc>::Element *E = NSL->library_classes[*s].find(p_name); @@ -171,7 +171,7 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha for (int i = 0; i < p_signal->num_args; i++) { PropertyInfo info; - godot_signal_argument arg = p_signal->args[i]; + godot_nativescript_signal_argument arg = p_signal->args[i]; info.hint = (PropertyHint)arg.hint; info.hint_string = *(String *)&arg.hint_string; @@ -184,7 +184,7 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha for (int i = 0; i < p_signal->num_default_args; i++) { Variant *v; - godot_signal_argument attrib = p_signal->args[i]; + godot_nativescript_signal_argument attrib = p_signal->args[i]; v = (Variant *)&attrib.default_value; |