From 450926693f0f18a40a7b60d64eef800f1a18a28a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 13 Dec 2015 07:50:07 -0300 Subject: fix zip export --- tools/editor/editor_import_export.cpp | 4 +++- tools/editor/project_export.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 64b104334f..3cd5cfd629 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -1081,12 +1081,14 @@ Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path Error EditorExportPlatform::save_zip_file(void *p_userdata,const String& p_path, const Vector& p_data,int p_file,int p_total) { + String path=p_path.replace_first("res://",""); + ZipData *zd = (ZipData*)p_userdata; zipFile zip=(zipFile)zd->zip; zipOpenNewFileInZip(zip, - p_path.utf8().get_data(), + path.utf8().get_data(), NULL, NULL, 0, diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index 36976a9120..29f9918e26 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -1407,7 +1407,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) { add_child(confirm); confirm->connect("confirmed",this,"_confirmed"); - get_ok()->set_text("Export PCK"); + get_ok()->set_text("Export PCK/Zip"); expopt="--,Export,Bundle"; -- cgit v1.2.3