diff options
| author | santiagopf <punto@Ariels-Mac-mini.local> | 2015-12-14 10:58:26 -0300 |
|---|---|---|
| committer | santiagopf <punto@Ariels-Mac-mini.local> | 2015-12-14 10:58:26 -0300 |
| commit | a9795d582665598decd4e73e1d879c83ce28a44b (patch) | |
| tree | 777a3da33fed3d6906704680e01bd87f97eba113 /core/globals.cpp | |
| parent | c8077de71475c174aa14fd045a2cddfc28de2468 (diff) | |
| parent | bfaa179e7088d9d6f4cf289e1915eec12c6b3b2a (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/globals.cpp')
| -rw-r--r-- | core/globals.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index aee708d0cd..0a6a1876b3 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -309,7 +309,7 @@ Error Globals::setup(const String& p_path,const String & p_main_pack) { print_line("has res dir: "+resource_path); if (!_load_resource_pack("res://data.pck")) - _load_resource_pack("res://data.pcz"); + _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) { @@ -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+"/"+exec_name+".pck") || _load_resource_pack(current_dir+"/"+exec_name+".pcz") )) { + 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) { _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+"/data.pck") || _load_resource_pack(current_dir+"/data.pcz") )) { + } 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) { _load_settings("res://override.cfg"); |