aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Castricum2016-12-05 21:07:11 +0100
committerBen Castricum2016-12-06 09:38:19 +0100
commiteb7ffb1e2cce1c77bebc156563d6d46d223b3885 (patch)
treefe5cda67c41997a410b3f60056df7c43aa5426f5
parente1ec91b69abe730f297dfe1fe1740f4b2a13d8da (diff)
downloadscummvm-rg350-eb7ffb1e2cce1c77bebc156563d6d46d223b3885.tar.gz
scummvm-rg350-eb7ffb1e2cce1c77bebc156563d6d46d223b3885.tar.bz2
scummvm-rg350-eb7ffb1e2cce1c77bebc156563d6d46d223b3885.zip
ALL: Unify 'corrupted engine data' message
-rw-r--r--engines/access/resources.cpp2
-rw-r--r--engines/drascula/drascula.cpp2
-rw-r--r--engines/hugo/hugo.cpp2
-rw-r--r--engines/lure/lure.cpp2
-rw-r--r--engines/mortevielle/mortevielle.cpp3
-rw-r--r--engines/tony/tony.cpp2
-rw-r--r--engines/toon/toon.cpp2
7 files changed, 8 insertions, 7 deletions
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 79cf844df6..78d0b013a3 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -49,7 +49,7 @@ bool Resources::load(Common::String &errorMessage) {
char buffer[4];
f.read(buffer, 4);
if (strncmp(buffer, "SVMA", 4)) {
- errorMessage = "Located access.dat file had invalid contents";
+ errorMessage = Common::String::format(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
return false;
}
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index f58104fd40..c5ee4cf360 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -976,7 +976,7 @@ bool DrasculaEngine::loadDrasculaDat() {
buf[8] = '\0';
if (strcmp(buf, "DRASCULA") != 0) {
- Common::String errorMessage = "File 'drascula.dat' is corrupt. Get it from the ScummVM website";
+ Common::String errorMessage = Common::String::format(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
GUIErrorMessage(errorMessage);
warning("%s", errorMessage.c_str());
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index e129727e84..0b4ed33bae 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -445,7 +445,7 @@ bool HugoEngine::loadHugoDat() {
in.read(buf, 4);
if (memcmp(buf, "HUGO", 4)) {
- Common::String errorMessage = "File 'hugo.dat' is corrupt. Get it from the ScummVM website";
+ Common::String errorMessage = Common::String::format(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
GUIErrorMessage(errorMessage);
return false;
}
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 9fd8372f29..f798ddbdb8 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -70,7 +70,7 @@ Common::Error LureEngine::init() {
f.close();
if (READ_LE_UINT16(&version.id) != 0xffff) {
- GUIError("Error validating %s - file is invalid or out of date", SUPPORT_FILENAME);
+ GUIError(_("File '%s' is corrupt. Get it from the ScummVM website"), SUPPORT_FILENAME);
return Common::kUnknownError;
} else if ((version.vMajor != LURE_DAT_MAJOR) || (version.vMinor != LURE_DAT_MINOR)) {
GUIError("Incorrect version of %s file - expected %d.%d but got %d.%d",
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index c56f22bb8f..14391a2241 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -312,7 +312,8 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
char fileId[4];
f.read(fileId, 4);
if (strncmp(fileId, "MORT", 4) != 0) {
- GUIErrorMessage("The located mort.dat data file is invalid");
+ Common::String msg = Common::String::format(_("File '%s' is corrupt. Get it from the ScummVM website"), MORT_DAT);
+ GUIErrorMessage(msg);
return Common::kReadingFailed;
}
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index a3ba9c0f0c..c3ae24b70d 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -207,7 +207,7 @@ bool TonyEngine::loadTonyDat() {
buf[4] = '\0';
if (strcmp(buf, "TONY")) {
- msg = "File 'tony.dat' is corrupt. Get it from the ScummVM website";
+ msg = Common::String::format(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
GUIErrorMessage(msg);
warning("%s", msg.c_str());
return false;
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index b0cbe80cfd..25eb7ad1d4 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -4927,7 +4927,7 @@ bool ToonEngine::loadToonDat() {
buf[4] = '\0';
if (strcmp(buf, "TOON")) {
- msg = _("File 'toon.dat' is corrupt. Get it from the ScummVM website");
+ msg = Common::String::format(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
GUIErrorMessage(msg);
warning("%s", msg.c_str());
return false;