Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages 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

6
core/input_map.cpp
View file

@ -29,7 +29,7 @@
/*************************************************************************/
#include "input_map.h"
#include "global_config.h"
#include "project_settings.h"
#include "os/keyboard.h"
InputMap *InputMap::singleton = NULL;
@ -189,7 +189,7 @@ void InputMap::load_from_globals() {
input_map.clear();
List<PropertyInfo> pinfo;
GlobalConfig::get_singleton()->get_property_list(&pinfo);
ProjectSettings::get_singleton()->get_property_list(&pinfo);
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
const PropertyInfo &pi = E->get();
@ -201,7 +201,7 @@ void InputMap::load_from_globals() {
add_action(name);
Array va = GlobalConfig::get_singleton()->get(pi.name);
Array va = ProjectSettings::get_singleton()->get(pi.name);
for (int i = 0; i < va.size(); i++) {