[Scummvm-git-logs] scummvm master -> adc0861c0aa0ce5cac84819591dbbb69580cff11

bluegr noreply at scummvm.org
Sun Aug 21 15:39:34 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
adc0861c0a DRAGONS: Fix depracted url for data files and put url in a const char var


Commit: adc0861c0aa0ce5cac84819591dbbb69580cff11
    https://github.com/scummvm/scummvm/commit/adc0861c0aa0ce5cac84819591dbbb69580cff11
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-08-21T18:39:30+03:00

Commit Message:
DRAGONS: Fix depracted url for data files and put url in a const char var

Changed paths:
    engines/dragons/dragons.cpp
    engines/dragons/metaengine.cpp


diff --git a/engines/dragons/dragons.cpp b/engines/dragons/dragons.cpp
index cf54e8bad65..e259c27dc3f 100644
--- a/engines/dragons/dragons.cpp
+++ b/engines/dragons/dragons.cpp
@@ -1799,8 +1799,8 @@ bool DragonsEngine::validateAVFile(const char *filename) {
 	file.close();
 
 	if(!fileValid) {
-		GUIErrorMessageWithURL(Common::U32String::format(_("Error: The file '%s' hasn't been extracted properly.\nPlease refer to the wiki page\nhttps://wiki.scummvm.org/index.php?title=HOWTO-PlayStation_Videos for details on how to properly extract the DTSPEECH.XA and *.STR files from your game disc."), filename),
-				"https://wiki.scummvm.org/index.php?title=HOWTO-PlayStation_Videos");
+		const char* urlForFileExtractionInfo = "https://wiki.scummvm.org/index.php?title=HOWTO-PlayStation_Videos";
+		GUIErrorMessageWithURL(Common::U32String::format(_("Error: The file '%s' hasn't been extracted properly.\nPlease refer to the wiki page\n%s for details on how to properly extract the DTSPEECH.XA and *.STR files from your game disc."), filename, urlForFileExtractionInfo), urlForFileExtractionInfo);
 	}
 	return fileValid;
 }
diff --git a/engines/dragons/metaengine.cpp b/engines/dragons/metaengine.cpp
index f635be6747c..e9fbf888ec9 100644
--- a/engines/dragons/metaengine.cpp
+++ b/engines/dragons/metaengine.cpp
@@ -112,14 +112,14 @@ SaveStateDescriptor DragonsMetaEngine::querySaveMetaInfos(const char *target, in
 
 Common::Error DragonsMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
 	const Dragons::DragonsGameDescription *gd = (const Dragons::DragonsGameDescription *)desc;
+	const char* urlForRequiredDataFiles = "https://wiki.scummvm.org/index.php?title=Blazing_Dragons#Required_data_files";
 
 	switch (gd->gameId) {
 	case Dragons::kGameIdDragons:
 		*engine = new Dragons::DragonsEngine(syst, desc);
 		break;
 	case Dragons::kGameIdDragonsBadExtraction:
-		GUIErrorMessageWithURL(_("Error: It appears that the game data files were extracted incorrectly.\n\nYou should only extract STR and XA files using the special method. The rest should be copied normally from your game CD.\n\n See https://wiki.scummvm.org/index.php?title=Datafiles#Blazing_Dragons"),
-		                       "https://wiki.scummvm.org/index.php?title=Datafiles#Blazing_Dragons");
+		GUIErrorMessageWithURL(Common::U32String::format(_("Error: It appears that the game data files were extracted incorrectly.\n\nYou should only extract STR and XA files using the special method. The rest should be copied normally from your game CD.\n\n See %s"), urlForRequiredDataFiles), urlForRequiredDataFiles);
 		break;
 	default:
 		return Common::kUnsupportedGameidError;




More information about the Scummvm-git-logs mailing list