|
@@ -253,7 +253,7 @@ Error GlobalConfig::setup(const String& p_path,const String & p_main_pack) {
|
|
|
bool ok = _load_resource_pack(p_main_pack);
|
|
|
ERR_FAIL_COND_V(!ok,ERR_CANT_OPEN);
|
|
|
|
|
|
- if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
|
|
|
+ if (_load_settings("res://godot.cfg")==OK || _load_settings_binary("res://godot.cfb")==OK) {
|
|
|
|
|
|
_load_settings("res://override.cfg");
|
|
|
|
|
@@ -275,7 +275,7 @@ Error GlobalConfig::setup(const String& p_path,const String & p_main_pack) {
|
|
|
memdelete(d);
|
|
|
|
|
|
}
|
|
|
- if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
|
|
|
+ if (_load_settings("res://godot.cfg")==OK || _load_settings_binary("res://godot.cfb")==OK) {
|
|
|
|
|
|
_load_settings("res://override.cfg");
|
|
|
|
|
@@ -291,7 +291,7 @@ Error GlobalConfig::setup(const String& p_path,const String & p_main_pack) {
|
|
|
|
|
|
if (FileAccessNetworkClient::get_singleton()) {
|
|
|
|
|
|
- if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
|
|
|
+ if (_load_settings("res://godot.cfg")==OK || _load_settings_binary("res://godot.cfb")==OK) {
|
|
|
|
|
|
_load_settings("res://override.cfg");
|
|
|
|
|
@@ -311,9 +311,9 @@ Error GlobalConfig::setup(const String& p_path,const String & p_main_pack) {
|
|
|
if (!_load_resource_pack("res://data.pck"))
|
|
|
_load_resource_pack("res://data.zip");
|
|
|
// make sure this is load from the resource path
|
|
|
- print_line("exists engine cfg? "+itos(FileAccess::exists("/engine.cfg")));
|
|
|
- if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
|
|
|
- print_line("loaded engine.cfg");
|
|
|
+ print_line("exists engine cfg? "+itos(FileAccess::exists("/godot.cfg")));
|
|
|
+ if (_load_settings("res://godot.cfg")==OK || _load_settings_binary("res://godot.cfb")==OK) {
|
|
|
+ print_line("loaded godot.cfg");
|
|
|
_load_settings("res://override.cfg");
|
|
|
|
|
|
}
|
|
@@ -341,7 +341,7 @@ Error GlobalConfig::setup(const String& p_path,const String & p_main_pack) {
|
|
|
|
|
|
//tries to open pack, but only first time
|
|
|
if (first_time && (_load_resource_pack(current_dir+"/"+exec_name+".pck") || _load_resource_pack(current_dir+"/"+exec_name+".zip") )) {
|
|
|
- if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
|
|
|
+ if (_load_settings("res://godot.cfg")==OK || _load_settings_binary("res://godot.cfb")==OK) {
|
|
|
|
|
|
_load_settings("res://override.cfg");
|
|
|
found=true;
|
|
@@ -350,7 +350,7 @@ Error GlobalConfig::setup(const String& p_path,const String & p_main_pack) {
|
|
|
}
|
|
|
break;
|
|
|
} else if (first_time && (_load_resource_pack(current_dir+"/data.pck") || _load_resource_pack(current_dir+"/data.zip") )) {
|
|
|
- if (_load_settings("res://engine.cfg")==OK || _load_settings_binary("res://engine.cfb")==OK) {
|
|
|
+ if (_load_settings("res://godot.cfg")==OK || _load_settings_binary("res://godot.cfb")==OK) {
|
|
|
|
|
|
_load_settings("res://override.cfg");
|
|
|
found=true;
|
|
@@ -358,7 +358,7 @@ Error GlobalConfig::setup(const String& p_path,const String & p_main_pack) {
|
|
|
|
|
|
}
|
|
|
break;
|
|
|
- } else if (_load_settings(current_dir+"/engine.cfg")==OK || _load_settings_binary(current_dir+"/engine.cfb")==OK) {
|
|
|
+ } else if (_load_settings(current_dir+"/godot.cfg")==OK || _load_settings_binary(current_dir+"/godot.cfb")==OK) {
|
|
|
|
|
|
_load_settings(current_dir+"/override.cfg");
|
|
|
candidate=current_dir;
|
|
@@ -416,7 +416,7 @@ Error GlobalConfig::_load_settings_binary(const String p_path) {
|
|
|
if (hdr[0]!='E'|| hdr[1]!='C' || hdr[2]!='F' || hdr[3]!='G') {
|
|
|
|
|
|
memdelete(f);
|
|
|
- ERR_EXPLAIN("Corrupted header in binary engine.cfb (not ECFG)");
|
|
|
+ ERR_EXPLAIN("Corrupted header in binary godot.cfb (not ECFG)");
|
|
|
ERR_FAIL_V(ERR_FILE_CORRUPT;)
|
|
|
}
|
|
|
|
|
@@ -526,7 +526,7 @@ void GlobalConfig::clear(const String& p_name) {
|
|
|
|
|
|
Error GlobalConfig::save() {
|
|
|
|
|
|
- return save_custom(get_resource_path()+"/engine.cfg");
|
|
|
+ return save_custom(get_resource_path()+"/godot.cfg");
|
|
|
}
|
|
|
|
|
|
Error GlobalConfig::_save_settings_binary(const String& p_file,const Map<String,List<String> > &props,const CustomMap& p_custom) {
|
|
@@ -536,7 +536,7 @@ Error GlobalConfig::_save_settings_binary(const String& p_file,const Map<String,
|
|
|
FileAccess *file = FileAccess::open(p_file,FileAccess::WRITE,&err);
|
|
|
if (err!=OK) {
|
|
|
|
|
|
- ERR_EXPLAIN("Coudln't save engine.cfb at "+p_file);
|
|
|
+ ERR_EXPLAIN("Coudln't save godot.cfb at "+p_file);
|
|
|
ERR_FAIL_COND_V(err,err)
|
|
|
}
|
|
|
|
|
@@ -604,7 +604,7 @@ Error GlobalConfig::_save_settings_text(const String& p_file,const Map<String,Li
|
|
|
FileAccess *file = FileAccess::open(p_file,FileAccess::WRITE,&err);
|
|
|
|
|
|
if (err) {
|
|
|
- ERR_EXPLAIN("Coudln't save engine.cfg - "+p_file);
|
|
|
+ ERR_EXPLAIN("Coudln't save godot.cfg - "+p_file);
|
|
|
ERR_FAIL_COND_V(err,err)
|
|
|
}
|
|
|
|
|
@@ -734,7 +734,7 @@ Error GlobalConfig::save_custom(const String& p_path,const CustomMap& p_custom,c
|
|
|
Error err = file->open(dst_file,FileAccess::WRITE);
|
|
|
if (err) {
|
|
|
memdelete(file);
|
|
|
- ERR_EXPLAIN("Coudln't save engine.cfg");
|
|
|
+ ERR_EXPLAIN("Coudln't save godot.cfg");
|
|
|
ERR_FAIL_COND_V(err,err)
|
|
|
}
|
|
|
|