Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Move singleton management from ProjectSettings to Engine

Browse source
This commit is contained in:
Leon Krause 2017-11-13 21:46:57 +01:00
parent 3732b2318e
commit 9b7b46143d
25 changed files with 130 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/gdscript/gd_script.cpp
View file

@ -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);
}