diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-15 02:01:39 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-15 02:02:41 -0300 |
| commit | 9afdb3e0ad5bfbdafe307212f5d4ebcc7c3ac852 (patch) | |
| tree | d25ef63dfe50d59987b4a611c1d1773185a3e35d /core/globals.cpp | |
| parent | b0870e487c6cc68bb0a2cef7174f3f5697667a2e (diff) | |
| download | redot-engine-9afdb3e0ad5bfbdafe307212f5d4ebcc7c3ac852.tar.gz | |
-fixed bug in Button now exporting font property
-made GUI Theme editor usable
-editor does not allow to export or create .pck in the same path as a project
-changed .pck format (lacked support for versioning so couldn't change it), previous was causing crashes and is now incompatible, just re-export.
-will not look for .pck files recursively, was causing unexpected behaviors
-fixed execution of Godot in paths with non unicode characters in Windows, OSX and Linux.
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index 85e03ead81..2eb26a7b19 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -319,11 +319,13 @@ Error Globals::setup(const String& p_path) { String candidate = d->get_current_dir(); String current_dir = d->get_current_dir(); bool found = false; + bool first_time=true; while(true) { //try to load settings in ascending through dirs shape! - if (_load_resource_pack(current_dir+"/data.pck") || _load_resource_pack(current_dir+"/data.pcz")) { + //tries to open pack, but only first time + if (first_time && _load_resource_pack(current_dir+"/data.pck")) { if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) { _load_settings("res://override.cfg"); @@ -344,6 +346,7 @@ Error Globals::setup(const String& p_path) { if (d->get_current_dir()==current_dir) break; //not doing anything useful current_dir=d->get_current_dir(); + first_time=false; } |