diff options
| author | masoud bh <masoud.bh@chmail.ir> | 2015-11-15 01:22:53 +0330 |
|---|---|---|
| committer | masoudbh3 <masoudbh3@gmail.com> | 2015-11-20 12:47:55 +0330 |
| commit | 6277fe3078eac6456968ca66d2abecf870d502b0 (patch) | |
| tree | ed926cbc8f3a9c4548e87398a11ed4e7f7614f5d /core/globals.cpp | |
| parent | 6f718228d4798352cef3c4a55ee10a811e4fa187 (diff) | |
add priority to load binaryname.pck
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index a4a5245f0b..aee708d0cd 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -340,7 +340,7 @@ Error Globals::setup(const String& p_path,const String & p_main_pack) { //try to load settings in ascending through dirs shape! //tries to open pack, but only first time - if (first_time && (_load_resource_pack(current_dir+"/data.pck") || _load_resource_pack(current_dir+"/data.pcz") )) { + if (first_time && (_load_resource_pack(current_dir+"/"+exec_name+".pck") || _load_resource_pack(current_dir+"/"+exec_name+".pcz") )) { if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) { _load_settings("res://override.cfg"); @@ -349,7 +349,7 @@ Error Globals::setup(const String& p_path,const String & p_main_pack) { } break; - } else if (first_time && (_load_resource_pack(current_dir+"/"+exec_name+".pck") || _load_resource_pack(current_dir+"/"+exec_name+".pcz") )) { + } else if (first_time && (_load_resource_pack(current_dir+"/data.pck") || _load_resource_pack(current_dir+"/data.pcz") )) { if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) { _load_settings("res://override.cfg"); |