godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

-Renamed GlobalConfig to ProjectSettings, makes more sense.

Browse Source 
-Added system for feature overrides, it's pretty cool :)
This commit is contained in:
Juan Linietsky
2017-07-19 17:00:46 -03:00
parent 89588d4334
commit 25678b1876
162 changed files with 1296 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/gdscript/gd_script.cpp
View File

@@ -29,7 +29,7 @@
/*************************************************************************/
#include "gd_script.h"
#include "gd_compiler.h"
#include "global_config.h"
#include "project_settings.h"
#include "global_constants.h"
#include "io/file_access_encrypted.h"
#include "os/file_access.h"
@@ -1454,9 +1454,9 @@ void GDScriptLanguage::init() {
//populate singletons
List<GlobalConfig::Singleton> singletons;
GlobalConfig::get_singleton()->get_singletons(&singletons);
for (List<GlobalConfig::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
List<ProjectSettings::Singleton> singletons;
ProjectSettings::get_singleton()->get_singletons(&singletons);
for (List<ProjectSettings::Singleton>::Element *E = singletons.front(); E; E = E->next()) {
_add_global(E->get().name, E->get().ptr);
}