diff options
| author | Leon Krause <lk@leonkrause.com> | 2017-11-13 21:46:57 +0100 |
|---|---|---|
| committer | Leon Krause <lk@leonkrause.com> | 2017-11-14 15:15:13 +0100 |
| commit | 9b7b46143d2df7d4f2efcb89ceb5034c7a57e79c (patch) | |
| tree | 8ceadc6a5891c5f3205b0e23d5b7dd6ef3d40e1f /platform/android/java_glue.cpp | |
| parent | 3732b2318e8a4942e8202f1797527220a5ae01a0 (diff) | |
Move singleton management from ProjectSettings to Engine
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 87f20bee91..90144d9b4d 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); } |