Skip to content
Permalink
Browse files

Fix wrong method binds and registered class

(cherry picked from commit 2f3328a)
  • Loading branch information...
neikeq authored and hpvb committed Apr 6, 2019
1 parent cab4921 commit 39f1a110a101c537cc22bd9285010a14209cabcd
Showing with 8 additions and 2 deletions.
  1. +5 −0 core/class_db.cpp
  2. +1 −0 core/class_db.h
  3. +1 −1 modules/mono/glue/base_object_glue.cpp
  4. +1 −1 scene/2d/animated_sprite.cpp
@@ -249,6 +249,11 @@ void ClassDB::set_current_api(APIType p_api) {
current_api = p_api;
}

ClassDB::APIType ClassDB::get_current_api() {

return current_api;
}

HashMap<StringName, ClassDB::ClassInfo> ClassDB::classes;
HashMap<StringName, StringName> ClassDB::resource_base_extensions;
HashMap<StringName, StringName> ClassDB::compat_classes;
@@ -371,6 +371,7 @@ class ClassDB {
static void init();

static void set_current_api(APIType p_api);
static APIType get_current_api();
static void cleanup();
};

@@ -192,7 +192,7 @@ MonoBoolean godot_icall_DynamicGodotObject_InvokeMember(Object *p_ptr, MonoStrin

*r_result = GDMonoMarshal::variant_to_mono_object(result);

return error.error == OK;
return error.error == Variant::CallError::CALL_OK;
}

MonoBoolean godot_icall_DynamicGodotObject_GetMember(Object *p_ptr, MonoString *p_name, MonoObject **r_result) {
@@ -679,7 +679,7 @@ void AnimatedSprite::_bind_methods() {
ClassDB::bind_method(D_METHOD("_set_playing", "playing"), &AnimatedSprite::_set_playing);
ClassDB::bind_method(D_METHOD("_is_playing"), &AnimatedSprite::_is_playing);

ClassDB::bind_method(D_METHOD("play", "anim", "backwards"), &AnimatedSprite::play, DEFVAL(StringName()));
ClassDB::bind_method(D_METHOD("play", "anim", "backwards"), &AnimatedSprite::play, DEFVAL(StringName()), DEFVAL(false));
ClassDB::bind_method(D_METHOD("stop"), &AnimatedSprite::stop);
ClassDB::bind_method(D_METHOD("is_playing"), &AnimatedSprite::is_playing);

0 comments on commit 39f1a11

Please sign in to comment.
You can’t perform that action at this time.