diff options
author | Karroffel <therzog@mail.de> | 2017-04-11 01:45:50 +0200 |
---|---|---|
committer | Karroffel <therzog@mail.de> | 2017-04-11 01:45:58 +0200 |
commit | 544940c1752d3b3b567a21c8753a7089beea4156 (patch) | |
tree | cd0a676617c3d8d92994e0cb93bd948d6f3503f0 | |
parent | 7919ec6d8902bd4013d2aadf1f0a2b246c355445 (diff) |
[GDNative] C API and generator fixes
-rw-r--r-- | modules/gdnative/api_generator.cpp | 1 | ||||
-rw-r--r-- | modules/gdnative/godot.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/gdnative/api_generator.cpp b/modules/gdnative/api_generator.cpp index 8569ae078e..d5f22ee7a3 100644 --- a/modules/gdnative/api_generator.cpp +++ b/modules/gdnative/api_generator.cpp @@ -402,6 +402,7 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) { source.push_back("\t\t\t\t\t{\n"); source.push_back("\t\t\t\t\t\t\"name\": \"" + e->get().argument_names[i] + "\",\n"); source.push_back("\t\t\t\t\t\t\"type\": \"" + e->get().argument_types[i] + "\",\n"); + source.push_back(String("\t\t\t\t\t\t\"has_default_value\": ") + (e->get().default_arguments.has(i) ? "true" : "false") + ",\n"); source.push_back("\t\t\t\t\t\t\"default_value\": \"" + (e->get().default_arguments.has(i) ? (String)e->get().default_arguments[i] : "") + "\"\n"); source.push_back(String("\t\t\t\t\t}") + ((i < e->get().argument_names.size() - 1) ? "," : "") + "\n"); } diff --git a/modules/gdnative/godot.h b/modules/gdnative/godot.h index bba0a3f98d..0d7aece23b 100644 --- a/modules/gdnative/godot.h +++ b/modules/gdnative/godot.h @@ -317,7 +317,7 @@ typedef struct godot_instance_create_func { void *(*create_func)(godot_object *, void *); void *method_data; void (*free_func)(void *); -} godot_script_instance_func; +} godot_instance_create_func; typedef struct godot_instance_destroy_func { // instance pointer, method data, user data |