ALL: Leave out instructions for engine data issues

11 files changed, 26 insertions, 49 deletions

diff --git a/README b/README
index 52adc11531..3c9474f64d 100644
--- a/README
+++ b/README
@@ -52,7 +52,6 @@ Table of Contents:
  * 5.3 Graphics Filters
  * 5.4 Hotkeys
  * 5.5 Language Options
- * 5.6 Common issues
 6.0) Saved Games
  * 6.1 Autosaves
  * 6.2 Converting saved games
@@ -1743,28 +1742,6 @@ Broken Sword
     cz  - Czech
 
 
-5.6) Common issues:
----- --------------
-"Engine data file missing/corrupt/wrong version"
-
-Some engines require some additional data (besides the game itself) to run
-a game. This data usually is included in the ScummVM installation package to
-ensure you always have the right version. But if for some reason you get an
-error about the engine data file, here are a few things you can try:
-
-- (Re)download and install the latest version of ScummVM package
-Because the package should contain the required data, this should fix it.
-
-- Download the engine data file manually from github
-On https://github.com/scummvm/scummvm/blob/master/dists/engine-data/ you can
-find the latest versions of all engine data files.
-
-- Check your path settings
-ScummVM will scan it's own directory and the Extra Path directory for the
-engine data files. Try moving the engine data file into those one of those
-directories.
-
-
 6.0) Saved Games:
 ---- ----------
 Saved games are by default put in the current directory on some platforms
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 96eab8b2d4..a7b23eb56d 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -41,7 +41,7 @@ bool Resources::load(Common::String &errorMessage) {
 	Common::File f;
 	Common::String filename = "access.dat";
 	if (!f.open(filename.c_str())) {
-		errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), filename.c_str());
+		errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file."), filename.c_str());
 		return false;
 	}
 
@@ -49,7 +49,7 @@ bool Resources::load(Common::String &errorMessage) {
 	char buffer[4];
 	f.read(buffer, 4);
 	if (strncmp(buffer, "SVMA", 4)) {
-		errorMessage = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), filename.c_str());
+		errorMessage = Common::String::format(_("The '%s' engine data file is corrupt."), filename.c_str());
 		return false;
 	}
 
@@ -58,7 +58,7 @@ bool Resources::load(Common::String &errorMessage) {
 	uint version = f.readUint16LE();
 	if (version != expectedVersion) {
 		errorMessage = Common::String::format(
-			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
+			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d."),
 			filename.c_str(), expectedVersion, 0, version, 0);
 		return false;
 	}
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index efcb36c0ae..655af480f2 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -962,7 +962,7 @@ bool DrasculaEngine::loadDrasculaDat() {
 	in.open(filename.c_str());
 
 	if (!in.isOpen()) {
-		Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), filename.c_str());
+		Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file."), filename.c_str());
 		GUIErrorMessage(errorMessage);
 		warning("%s", errorMessage.c_str());
 
@@ -976,7 +976,7 @@ bool DrasculaEngine::loadDrasculaDat() {
 	buf[8] = '\0';
 
 	if (strcmp(buf, "DRASCULA") != 0) {
-		Common::String errorMessage = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), filename.c_str());
+		Common::String errorMessage = Common::String::format(_("The '%s' engine data file is corrupt."), filename.c_str());
 		GUIErrorMessage(errorMessage);
 		warning("%s", errorMessage.c_str());
 
@@ -987,7 +987,7 @@ bool DrasculaEngine::loadDrasculaDat() {
 
 	if (ver != DRASCULA_DAT_VER) {
 		Common::String errorMessage = Common::String::format(
-			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
+			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d."),
 			filename.c_str(), DRASCULA_DAT_VER, 0, ver, 0);
 		GUIErrorMessage(errorMessage);
 		warning("%s", errorMessage.c_str());
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index b7ad700059..6881278cee 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -434,7 +434,7 @@ bool HugoEngine::loadHugoDat() {
 	in.open(filename.c_str());
 
 	if (!in.isOpen()) {
-		Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), filename.c_str());
+		Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file."), filename.c_str());
 		GUIErrorMessage(errorMessage);
 		warning("%s", errorMessage.c_str());
 		return false;
@@ -445,7 +445,7 @@ bool HugoEngine::loadHugoDat() {
 	in.read(buf, 4);
 
 	if (memcmp(buf, "HUGO", 4)) {
-		Common::String errorMessage = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), filename.c_str());
+		Common::String errorMessage = Common::String::format(_("The '%s' engine data file is corrupt."), filename.c_str());
 		GUIErrorMessage(errorMessage);
 		return false;
 	}
@@ -455,7 +455,7 @@ bool HugoEngine::loadHugoDat() {
 
 	if ((majVer != HUGO_DAT_VER_MAJ) || (minVer != HUGO_DAT_VER_MIN)) {
 		Common::String errorMessage = Common::String::format(
-			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
+			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d."),
 			filename.c_str(),HUGO_DAT_VER_MAJ, HUGO_DAT_VER_MIN, majVer, minVer);
 		GUIErrorMessage(errorMessage);
 		return false;
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 5e52834f64..5a45566c9a 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -161,7 +161,7 @@ bool StaticResource::loadStaticResourceFile() {
 	}
 
 	if (!foundWorkingKyraDat) {
-		Common::String errorMessage = "You're missing the '" + StaticResource::staticDataFilename() + "' engine data file or it got corrupted. Read the README for instructions.";
+		Common::String errorMessage = "You're missing the '" + StaticResource::staticDataFilename() + "' engine data file or it got corrupted.";
 		GUIErrorMessage(errorMessage);
 		error("%s", errorMessage.c_str());
 	}
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 245aa96994..8eac519d8c 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -61,7 +61,7 @@ Common::Error LureEngine::init() {
 	Common::File f;
 	VersionStructure version;
 	if (!f.open(SUPPORT_FILENAME)) {
-		GUIError(_("Unable to locate the '%s' engine data file. Read the README for instructions."), SUPPORT_FILENAME);
+		GUIError(_("Unable to locate the '%s' engine data file."), SUPPORT_FILENAME);
 		return Common::kUnknownError;
 	}
 
@@ -70,10 +70,10 @@ Common::Error LureEngine::init() {
 	f.close();
 
 	if (READ_LE_UINT16(&version.id) != 0xffff) {
-		GUIError(_("The '%s' engine data file is corrupt. Read the README for instructions."), SUPPORT_FILENAME);
+		GUIError(_("The '%s' engine data file is corrupt."), SUPPORT_FILENAME);
 		return Common::kUnknownError;
 	} else if ((version.vMajor != LURE_DAT_MAJOR) || (version.vMinor != LURE_DAT_MINOR)) {
-		GUIError(_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
+		GUIError(_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d."),
 			SUPPORT_FILENAME, LURE_DAT_MAJOR, LURE_DAT_MINOR,
 			version.vMajor, version.vMinor);
 		return Common::kUnknownError;
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 203eea53b6..59004cba7f 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -303,7 +303,7 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
 
 	// Open the mort.dat file
 	if (!f.open(MORT_DAT)) {
-		Common::String msg = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), MORT_DAT);
+		Common::String msg = Common::String::format(_("Unable to locate the '%s' engine data file."), MORT_DAT);
 		GUIErrorMessage(msg);
 		return Common::kReadingFailed;
 	}
@@ -312,7 +312,7 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
 	char fileId[4];
 	f.read(fileId, 4);
 	if (strncmp(fileId, "MORT", 4) != 0) {
-		Common::String msg = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), MORT_DAT);
+		Common::String msg = Common::String::format(_("The '%s' engine data file is corrupt."), MORT_DAT);
 		GUIErrorMessage(msg);
 		return Common::kReadingFailed;
 	}
@@ -323,7 +323,7 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
 
 	if (majVer < MORT_DAT_REQUIRED_VERSION) {
 		Common::String msg = Common::String::format(
-			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
+			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d."),
 			MORT_DAT, MORT_DAT_REQUIRED_VERSION, 0, majVer, minVer);
 		GUIErrorMessage(msg);
 		return Common::kReadingFailed;
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index c04a2eae0d..ab244c1f84 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -128,7 +128,7 @@ SkyCompact::SkyCompact() {
 	_cptFile = new Common::File();
 	Common::String filename = "sky.cpt";
 	if (!_cptFile->open(filename.c_str())) {
-                Common::String msg = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), filename.c_str());
+                Common::String msg = Common::String::format(_("Unable to locate the '%s' engine data file."), filename.c_str());
                 GUIErrorMessage(msg);
                 error("%s", msg.c_str());
 	}
@@ -138,7 +138,7 @@ SkyCompact::SkyCompact() {
 		error("unknown \"sky.cpt\" version");
 
 	if (SKY_CPT_SIZE != _cptFile->size()) {
-		GUI::MessageDialog dialog(_("The \"sky.cpt\" file has an incorrect size.\nPlease (re)download it from www.scummvm.org"), _("OK"), NULL);
+		GUI::MessageDialog dialog(_("The \"sky.cpt\" engine data file has an incorrect size."), _("OK"), NULL);
 		dialog.runModal();
 		error("Incorrect sky.cpt size (%d, expected: %d)", _cptFile->size(), SKY_CPT_SIZE);
 	}
diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index 8434395593..b7e0d558f1 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -94,7 +94,7 @@ bool Resources::loadArchives(const ADGameDescription *gd) {
 	Common::String filename = "teenagent.dat";
 	if (!dat_file->open(filename.c_str())) {
 		delete dat_file;
-		Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), filename.c_str());
+		Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file."), filename.c_str());
 		warning("%s", errorMessage.c_str());
 		GUIErrorMessage(errorMessage);
 		return false;
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index b1225b5e31..8a7b676918 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -195,7 +195,7 @@ bool TonyEngine::loadTonyDat() {
 	in.open(filename.c_str());
 
 	if (!in.isOpen()) {
-		msg = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), filename.c_str());
+		msg = Common::String::format(_("Unable to locate the '%s' engine data file."), filename.c_str());
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 		return false;
@@ -207,7 +207,7 @@ bool TonyEngine::loadTonyDat() {
 	buf[4] = '\0';
 
 	if (strcmp(buf, "TONY")) {
-		msg = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), filename.c_str());
+		msg = Common::String::format(_("The '%s' engine data file is corrupt."), filename.c_str());
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 		return false;
@@ -218,7 +218,7 @@ bool TonyEngine::loadTonyDat() {
 
 	if ((majVer != TONY_DAT_VER_MAJ) || (minVer != TONY_DAT_VER_MIN)) {
 		msg = Common::String::format(
-			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
+			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d."),
 			filename.c_str(), TONY_DAT_VER_MAJ, TONY_DAT_VER_MIN, majVer, minVer);
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
@@ -255,7 +255,7 @@ bool TonyEngine::loadTonyDat() {
 
 	int numVariant = in.readUint16BE();
 	if (expectedLangVariant > numVariant - 1) {
-		msg = Common::String::format(_("Font variant not present in '%s' engine data file. Read the README for instructions."), filename.c_str());
+		msg = Common::String::format(_("Font variant not present in '%s' engine data file."), filename.c_str());
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index c17b44ce95..dc1c515e1c 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -4915,7 +4915,7 @@ bool ToonEngine::loadToonDat() {
 	in.open(filename.c_str());
 
 	if (!in.isOpen()) {
-		msg = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), filename.c_str());
+		msg = Common::String::format(_("Unable to locate the '%s' engine data file."), filename.c_str());
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 		return false;
@@ -4927,7 +4927,7 @@ bool ToonEngine::loadToonDat() {
 	buf[4] = '\0';
 
 	if (strcmp(buf, "TOON")) {
-		msg = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), filename.c_str());
+		msg = Common::String::format(_("The '%s' engine data file is corrupt."), filename.c_str());
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());
 		return false;
@@ -4938,7 +4938,7 @@ bool ToonEngine::loadToonDat() {
 
 	if ((majVer != TOON_DAT_VER_MAJ) || (minVer != TOON_DAT_VER_MIN)) {
 		msg = Common::String::format(
-			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
+			_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d."),
 			filename.c_str(), TOON_DAT_VER_MAJ, TOON_DAT_VER_MIN, majVer, minVer);
 		GUIErrorMessage(msg);
 		warning("%s", msg.c_str());