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 /modules/gdscript/gd_script.cpp | |
parent | 3732b2318e8a4942e8202f1797527220a5ae01a0 (diff) | |
download | redot-engine-9b7b46143d2df7d4f2efcb89ceb5034c7a57e79c.tar.gz |
Move singleton management from ProjectSettings to Engine
Diffstat (limited to 'modules/gdscript/gd_script.cpp')
-rw-r--r-- | modules/gdscript/gd_script.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index e5016c59bd..ba0353ae4a 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "gd_script.h" +#include "engine.h" #include "gd_compiler.h" #include "global_constants.h" #include "io/file_access_encrypted.h" @@ -1347,9 +1348,9 @@ void GDScriptLanguage::init() { //populate singletons - List<ProjectSettings::Singleton> singletons; - ProjectSettings::get_singleton()->get_singletons(&singletons); - for (List<ProjectSettings::Singleton>::Element *E = singletons.front(); E; E = E->next()) { + List<Engine::Singleton> singletons; + Engine::get_singleton()->get_singletons(&singletons); + for (List<Engine::Singleton>::Element *E = singletons.front(); E; E = E->next()) { _add_global(E->get().name, E->get().ptr); } |