From 91c04fa311e04b92e6c1a477cf4dbd9cf13656ed Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 16 Dec 2023 21:09:36 +0100 Subject: [PATCH] DISTS: Rename cloud_connection.zip to helpdialog.zip and add it to the dist lists --- Makefile.common | 1 + devtools/create_project/xcode.cpp | 1 + dists/engine-data/README | 3 +++ .../{cloud_connection.zip => helpdialog.zip} | Bin dists/irix/scummvm.idb | 1 + dists/scummvm.rc | 1 + dists/win32/migration.txt | 1 + gui/helpdialog.cpp | 4 ++-- 8 files changed, 10 insertions(+), 2 deletions(-) rename dists/engine-data/{cloud_connection.zip => helpdialog.zip} (100%) diff --git a/Makefile.common b/Makefile.common index 0ba3541a262..1d03a626855 100644 --- a/Makefile.common +++ b/Makefile.common @@ -494,6 +494,7 @@ endif DIST_FILES_ENGINEDATA+=achievements.dat DIST_FILES_ENGINEDATA+=classicmacfonts.dat DIST_FILES_ENGINEDATA+=encoding.dat +DIST_FILES_ENGINEDATA+=helpdialog.zip DIST_FILES_ENGINEDATA+=macgui.dat DIST_FILES_ENGINEDATA:=$(addprefix $(srcdir)/dists/engine-data/,$(DIST_FILES_ENGINEDATA)) diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index be81f53c396..ed581b298ca 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -1036,6 +1036,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu files.push_back("dists/engine-data/fonts-cjk.dat"); files.push_back("dists/engine-data/freescape.dat"); files.push_back("dists/engine-data/hadesch_translations.dat"); + files.push_back("dists/engine-data/helpdialog.zip"); files.push_back("dists/engine-data/hugo.dat"); files.push_back("dists/engine-data/kyra.dat"); files.push_back("dists/engine-data/lure.dat"); diff --git a/dists/engine-data/README b/dists/engine-data/README index 56366c668cf..62e5a9f79a6 100644 --- a/dists/engine-data/README +++ b/dists/engine-data/README @@ -45,6 +45,9 @@ This file contains set of script patches for Grim Fandango game. hadesch_translations.dat: This file contains essential data for Hadesch Challenge game. +helpdialog.zip: +This file contains images for Help Dialog. + hugo.dat: This file contains all the hardcoded logic, strings and fonts used by Hugo engine. Those information were stored in the original executables. diff --git a/dists/engine-data/cloud_connection.zip b/dists/engine-data/helpdialog.zip similarity index 100% rename from dists/engine-data/cloud_connection.zip rename to dists/engine-data/helpdialog.zip diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb index 31063feea26..7859736903f 100644 --- a/dists/irix/scummvm.idb +++ b/dists/irix/scummvm.idb @@ -26,6 +26,7 @@ f 0644 root sys usr/ScummVM/share/scummvm/encoding.dat encoding.dat scummvm.sw.e f 0644 root sys usr/ScummVM/share/scummvm/fonts.dat fonts.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/fonts-cjk.dat fonts-cjk.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/grim-patch.lab grim-patch.lab scummvm.sw.eoe +f 0644 root sys usr/ScummVM/share/scummvm/helpdialog.zip helpdialog.zip scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/hugo.dat hugo.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/hadesch_translations.dat hadesch_translations.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/kyra.dat kyra.dat scummvm.sw.eoe diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 504ae321843..8daa4f12558 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -28,6 +28,7 @@ gui-icons.dat FILE "gui/themes/gui-icons.dat" shaders.dat FILE "gui/themes/shaders.dat" achievements.dat FILE "dists/engine-data/achievements.dat" encoding.dat FILE "dists/engine-data/encoding.dat" +helpdialog.zip FILE "dists/engine-data/helpdialog.zip" macgui.dat FILE "dists/engine-data/macgui.dat" classicmacfonts.dat FILE "dists/engine-data/classicmacfonts.dat" diff --git a/dists/win32/migration.txt b/dists/win32/migration.txt index c39fcb77734..a897aeb3e8a 100644 --- a/dists/win32/migration.txt +++ b/dists/win32/migration.txt @@ -25,6 +25,7 @@ freescape.dat grim-patch.lab gui-icons.dat hadesch_translations.dat +helpdialog.zip hugo.dat kyra.dat lure.dat diff --git a/gui/helpdialog.cpp b/gui/helpdialog.cpp index 19b83105fbb..c6b33e7f110 100644 --- a/gui/helpdialog.cpp +++ b/gui/helpdialog.cpp @@ -58,7 +58,7 @@ _s( #ifdef USE_CLOUD _s("Cloud"), -"cloud_connection.zip", +"helpdialog.zip", _s( "## Connecting a cloud service - Quick mode\n" "\n" @@ -82,7 +82,7 @@ _s( "\n " " ![Open the link](open_link.png \"Open the link\"){w=70%}\n" "\n" -"6. In the browser window that opens, select the cloud service to connect. \n" +"6. In the browser window that opens, select the cloud service to connect. \n" "\n " " ![Choose the cloud service](cloud_browser.png \"Choose the cloud service\"){w=70%}\n" "\n"