diff options
| author | Rémi Verschelde | 2017-11-14 20:44:55 +0100 |
|---|---|---|
| committer | GitHub | 2017-11-14 20:44:55 +0100 |
| commit | 61a693cf782c952dc151d8d77b1ab365888e6701 (patch) | |
| tree | f6e629e3b1a4546105edcd0ea9a5bb130b9198f0 /platform/android/java_glue.cpp | |
| parent | 04edfc090b0e78f4f820977da8cb4eb2d015c5f7 (diff) | |
| parent | acb23adad37b459e64b8f9bafbbdd1185d46093d (diff) | |
| download | godot-61a693cf782c952dc151d8d77b1ab365888e6701.tar.gz godot-61a693cf782c952dc151d8d77b1ab365888e6701.tar.zst godot-61a693cf782c952dc151d8d77b1ab365888e6701.zip | |
Merge pull request #12922 from eska014/engine-singletons
Singleton management changes
Diffstat (limited to 'platform/android/java_glue.cpp')
| -rw-r--r-- | platform/android/java_glue.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 87f20bee9..90144d9b4 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -34,6 +34,7 @@ #include "audio_driver_jandroid.h" #include "core/os/keyboard.h" #include "dir_access_jandroid.h" +#include "engine.h" #include "file_access_android.h" #include "file_access_jandroid.h" #include "java_class_wrapper.h" @@ -953,7 +954,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jo __android_log_print(ANDROID_LOG_INFO, "godot", "*****SETUP OK"); java_class_wrapper = memnew(JavaClassWrapper(_godot_instance)); - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton("JavaClassWrapper", java_class_wrapper)); + Engine::get_singleton()->add_singleton(Engine::Singleton("JavaClassWrapper", java_class_wrapper)); _initialize_java_modules(); } @@ -1426,7 +1427,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_singleton(JNIEnv *env s->set_instance(env->NewGlobalRef(p_object)); jni_singletons[singname] = s; - ProjectSettings::get_singleton()->add_singleton(ProjectSettings::Singleton(singname, s)); + Engine::get_singleton()->add_singleton(Engine::Singleton(singname, s)); ProjectSettings::get_singleton()->set(singname, s); } |