Merge pull request #155 from BastiaanOlij/fix_register_tool

Fixed up registering tool and updated godot_headers
pull/157/head
Bastiaan Olij 2018-07-26 22:00:44 +10:00 committed by GitHub
commit 2ed8e3e217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 2d221de20c7ddc297b8bb14f0dbd55c053eb3024 Subproject commit 32aa216babcc9ae63d971825c67f8d3142114c47

View File

@ -123,10 +123,10 @@ void register_tool_class()
godot_instance_destroy_func destroy = {}; godot_instance_destroy_func destroy = {};
destroy.destroy_func = _godot_class_destroy_func<T>; destroy.destroy_func = _godot_class_destroy_func<T>;
_TagDB::register_type(T::___get_type_tag(), T::___get_base_type_tag()); _TagDB::register_type(typeid(T).hash_code(), typeid(T).hash_code());
godot::nativescript_api->godot_nativescript_register_tool_class(godot::_RegisterState::nativescript_handle, T::___get_type_name(), T::___get_base_type_name(), create, destroy); godot::nativescript_api->godot_nativescript_register_tool_class(godot::_RegisterState::nativescript_handle, T::___get_type_name(), T::___get_base_type_name(), create, destroy);
godot::nativescript_1_1_api->godot_nativescript_set_type_tag(godot::_RegisterState::nativescript_handle, T::___get_type_name(), T::___get_type_tag()); godot::nativescript_1_1_api->godot_nativescript_set_type_tag(godot::_RegisterState::nativescript_handle, T::___get_type_name(), (const void *) typeid(T).hash_code());
T::_register_methods(); T::_register_methods();
} }