diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2015-11-23 09:59:48 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2015-11-23 09:59:48 +0100 |
| commit | 74e0c76216bdcb9d6b516dded2bee5f1b509cbd0 (patch) | |
| tree | 16b0f886ea66347593fa76be2bd7826490b2e283 /core/globals.cpp | |
| parent | d405e6ae35be8d266ec7b1776ad0f9cb0716f963 (diff) | |
| parent | 6277fe3078eac6456968ca66d2abecf870d502b0 (diff) | |
Merge pull request #2788 from masoudbh3/pck-file-name
Load binaryname.pck
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index ffd4cf5d5e..aee708d0cd 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -332,6 +332,7 @@ Error Globals::setup(const String& p_path,const String & p_main_pack) { String candidate = d->get_current_dir(); String current_dir = d->get_current_dir(); + String exec_name = OS::get_singleton()->get_executable_path().get_file().basename(); bool found = false; bool first_time=true; @@ -339,7 +340,16 @@ 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"); + found=true; + + + } + break; + } 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"); |