Load binaryname.pck
if not found data.pck search for binaryname.pck in linux and windows
This commit is contained in:
parent
85eedffbc7
commit
6f718228d4
1 changed files with 10 additions and 0 deletions
|
@ -332,6 +332,7 @@ Error Globals::setup(const String& p_path,const String & p_main_pack) {
|
||||||
|
|
||||||
String candidate = d->get_current_dir();
|
String candidate = d->get_current_dir();
|
||||||
String current_dir = 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 found = false;
|
||||||
bool first_time=true;
|
bool first_time=true;
|
||||||
|
|
||||||
|
@ -346,6 +347,15 @@ Error Globals::setup(const String& p_path,const String & p_main_pack) {
|
||||||
found=true;
|
found=true;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
} else 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;
|
break;
|
||||||
} else if (_load_settings(current_dir+"/engine.cfg")==OK || _load_settings_binary(current_dir+"/engine.cfb")==OK) {
|
} else if (_load_settings(current_dir+"/engine.cfg")==OK || _load_settings_binary(current_dir+"/engine.cfb")==OK) {
|
||||||
|
|
Loading…
Reference in a new issue