[Scummvm-git-logs] scummvm master -> 0e5788f4e3b4060c4a78527815ddbdc63c9f4d67
sev-
sev at scummvm.org
Sat Dec 17 12:45:46 CET 2016
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e1ec91b69a ALL: Unify 'missing engine data' message
eb7ffb1e2c ALL: Unify 'corrupted engine data' message
1cf3f50b74 ALL: Unify 'wrong version of engine data' message
55512414dd ALL: Change instructions for engine data file issues
0e47d71928 ALL: replace 2 more 'download engine data' instructions
722e52e27a README: Update TOC
ebaab44cd1 ALL: Leave out instructions for engine data issues
0e5788f4e3 Merge pull request #866 from BenCastricum/editing
Commit: e1ec91b69abe730f297dfe1fe1740f4b2a13d8da
https://github.com/scummvm/scummvm/commit/e1ec91b69abe730f297dfe1fe1740f4b2a13d8da
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-12-05T21:04:50+01:00
Commit Message:
ALL: Unify 'missing engine data' message
Changed paths:
A engines/access/POTFILES
A engines/lure/POTFILES
A engines/mortevielle/POTFILES
A engines/tony/POTFILES
engines/access/resources.cpp
engines/drascula/POTFILES
engines/drascula/drascula.cpp
engines/hugo/POTFILES
engines/hugo/hugo.cpp
engines/lure/lure.cpp
engines/mortevielle/mortevielle.cpp
engines/sky/compact.cpp
engines/teenagent/resources.cpp
engines/tony/tony.cpp
engines/toon/toon.cpp
diff --git a/engines/access/POTFILES b/engines/access/POTFILES
new file mode 100644
index 0000000..eafbe17
--- /dev/null
+++ b/engines/access/POTFILES
@@ -0,0 +1 @@
+engines/access/resources.cpp
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 096fb15..79cf844 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -24,6 +24,7 @@
#include "access/access.h"
#include "access/amazon/amazon_resources.h"
#include "access/martian/martian_resources.h"
+#include "common/translation.h"
namespace Access {
@@ -38,8 +39,9 @@ Resources *Resources::init(AccessEngine *vm) {
bool Resources::load(Common::String &errorMessage) {
Common::File f;
- if (!f.open("access.dat")) {
- errorMessage = "Could not locate required access.dat file";
+ Common::String filename = "access.dat";
+ if (!f.open(filename.c_str())) {
+ errorMessage = Common::String::format(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
return false;
}
diff --git a/engines/drascula/POTFILES b/engines/drascula/POTFILES
index ea79f9e..925b309 100644
--- a/engines/drascula/POTFILES
+++ b/engines/drascula/POTFILES
@@ -1,2 +1,3 @@
+engines/drascula/drascula.cpp
engines/drascula/detection.cpp
engines/drascula/saveload.cpp
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index ab91056..f58104f 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -25,6 +25,7 @@
#include "common/file.h"
#include "common/config-manager.h"
#include "common/textconsole.h"
+#include "common/translation.h"
#include "backends/audiocd/audiocd.h"
@@ -955,12 +956,13 @@ void DrasculaEngine::hipo_sin_nadie(int counter){
bool DrasculaEngine::loadDrasculaDat() {
Common::File in;
+ Common::String filename = "drascula.dat";
int i;
- in.open("drascula.dat");
+ in.open(filename.c_str());
if (!in.isOpen()) {
- Common::String errorMessage = "You're missing the 'drascula.dat' file. Get it from the ScummVM website";
+ Common::String errorMessage = Common::String::format(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
GUIErrorMessage(errorMessage);
warning("%s", errorMessage.c_str());
diff --git a/engines/hugo/POTFILES b/engines/hugo/POTFILES
index ff61e12..b7b99ca 100644
--- a/engines/hugo/POTFILES
+++ b/engines/hugo/POTFILES
@@ -1 +1,2 @@
+engines/hugo/hugo.cpp
engines/hugo/file.cpp
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index 267eb08..e129727 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -27,6 +27,7 @@
#include "common/debug-channels.h"
#include "common/config-manager.h"
#include "common/textconsole.h"
+#include "common/translation.h"
#include "hugo/hugo.h"
#include "hugo/console.h"
@@ -429,10 +430,11 @@ void HugoEngine::runMachine() {
*/
bool HugoEngine::loadHugoDat() {
Common::File in;
- in.open("hugo.dat");
+ Common::String filename = "hugo.dat";
+ in.open(filename.c_str());
if (!in.isOpen()) {
- Common::String errorMessage = "You're missing the 'hugo.dat' file. Get it from the ScummVM website";
+ Common::String errorMessage = Common::String::format(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
GUIErrorMessage(errorMessage);
warning("%s", errorMessage.c_str());
return false;
diff --git a/engines/lure/POTFILES b/engines/lure/POTFILES
new file mode 100644
index 0000000..d4fde2a
--- /dev/null
+++ b/engines/lure/POTFILES
@@ -0,0 +1 @@
+engines/lure/lure.cpp
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 45fe0af..9fd8372 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -24,6 +24,7 @@
#include "common/debug-channels.h"
#include "common/system.h"
#include "common/savefile.h"
+#include "common/translation.h"
#include "engines/util.h"
@@ -60,7 +61,7 @@ Common::Error LureEngine::init() {
Common::File f;
VersionStructure version;
if (!f.open(SUPPORT_FILENAME)) {
- GUIError("Could not locate Lure support file");
+ GUIError(_("You're missing the '%s' file. Get it from the ScummVM website"), SUPPORT_FILENAME);
return Common::kUnknownError;
}
diff --git a/engines/mortevielle/POTFILES b/engines/mortevielle/POTFILES
new file mode 100644
index 0000000..ee7ef3e
--- /dev/null
+++ b/engines/mortevielle/POTFILES
@@ -0,0 +1 @@
+engines/mortevielle/mortevielle.cpp
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 4f0899d..c56f22b 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -37,6 +37,7 @@
#include "common/system.h"
#include "common/config-manager.h"
#include "common/debug-channels.h"
+#include "common/translation.h"
#include "engines/util.h"
#include "engines/engine.h"
#include "graphics/palette.h"
@@ -302,7 +303,8 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
// Open the mort.dat file
if (!f.open(MORT_DAT)) {
- GUIErrorMessage("Could not locate 'mort.dat'.");
+ Common::String msg = Common::String::format(_("You're missing the '%s' file. Get it from the ScummVM website"), MORT_DAT);
+ GUIErrorMessage(msg);
return Common::kReadingFailed;
}
diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp
index c2ca557..731c390 100644
--- a/engines/sky/compact.cpp
+++ b/engines/sky/compact.cpp
@@ -126,11 +126,11 @@ static const uint32 turnTableOffsets[] = {
SkyCompact::SkyCompact() {
_cptFile = new Common::File();
- if (!_cptFile->open("sky.cpt")) {
- GUI::MessageDialog dialog(_("Unable to find \"sky.cpt\" file!\n"
- "Please download it from www.scummvm.org"), _("OK"), NULL);
- dialog.runModal();
- error("Unable to find \"sky.cpt\" file\nPlease download it from www.scummvm.org");
+ Common::String filename = "sky.cpt";
+ if (!_cptFile->open(filename.c_str())) {
+ Common::String msg = Common::String::format(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
+ GUIErrorMessage(msg);
+ error("%s", msg.c_str());
}
uint16 fileVersion = _cptFile->readUint16LE();
diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index 3cf566a..ebfe5ff 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -91,9 +91,10 @@ void Resources::precomputeDialogOffsets() {
bool Resources::loadArchives(const ADGameDescription *gd) {
Common::File *dat_file = new Common::File();
- if (!dat_file->open("teenagent.dat")) {
+ Common::String filename = "teenagent.dat";
+ if (!dat_file->open(filename.c_str())) {
delete dat_file;
- Common::String errorMessage = _("You're missing the 'teenagent.dat' file. Get it from the ScummVM website");
+ Common::String errorMessage = Common::String::format(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
warning("%s", errorMessage.c_str());
GUIErrorMessage(errorMessage);
return false;
diff --git a/engines/tony/POTFILES b/engines/tony/POTFILES
new file mode 100644
index 0000000..a2e3c09
--- /dev/null
+++ b/engines/tony/POTFILES
@@ -0,0 +1 @@
+engines/tony/tony.cpp
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index c51f449..a3ba9c0 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -27,6 +27,7 @@
#include "common/events.h"
#include "common/file.h"
#include "common/installshield_cab.h"
+#include "common/translation.h"
#include "tony/tony.h"
#include "tony/custom.h"
#include "tony/debugger.h"
@@ -189,11 +190,12 @@ Common::ErrorCode TonyEngine::init() {
bool TonyEngine::loadTonyDat() {
Common::String msg;
Common::File in;
+ Common::String filename = "tony.dat";
- in.open("tony.dat");
+ in.open(filename.c_str());
if (!in.isOpen()) {
- msg = "You're missing the 'tony.dat' file. Get it from the ScummVM website";
+ msg = Common::String::format(_("You're missing the '%s' file. 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 43fb3a1..b0cbe80 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -4909,12 +4909,13 @@ void ToonEngine::createShadowLUT() {
bool ToonEngine::loadToonDat() {
Common::File in;
Common::String msg;
+ Common::String filename = "toon.dat";
int majVer, minVer;
- in.open("toon.dat");
+ in.open(filename.c_str());
if (!in.isOpen()) {
- msg = _("You're missing the 'toon.dat' file. Get it from the ScummVM website");
+ msg = Common::String::format(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
GUIErrorMessage(msg);
warning("%s", msg.c_str());
return false;
Commit: eb7ffb1e2cce1c77bebc156563d6d46d223b3885
https://github.com/scummvm/scummvm/commit/eb7ffb1e2cce1c77bebc156563d6d46d223b3885
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-12-06T09:38:19+01:00
Commit Message:
ALL: Unify 'corrupted engine data' message
Changed paths:
engines/access/resources.cpp
engines/drascula/drascula.cpp
engines/hugo/hugo.cpp
engines/lure/lure.cpp
engines/mortevielle/mortevielle.cpp
engines/tony/tony.cpp
engines/toon/toon.cpp
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 79cf844..78d0b01 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 f58104f..c5ee4cf 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 e129727..0b4ed33 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 9fd8372..f798ddb 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 c56f22b..14391a2 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 a3ba9c0..c3ae24b 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 b0cbe80..25eb7ad 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;
Commit: 1cf3f50b7429483409e16994a21c040235abd261
https://github.com/scummvm/scummvm/commit/1cf3f50b7429483409e16994a21c040235abd261
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-12-06T09:38:25+01:00
Commit Message:
ALL: Unify 'wrong version of engine data' message
Changed paths:
engines/access/resources.cpp
engines/drascula/drascula.cpp
engines/hugo/hugo.cpp
engines/lure/lure.cpp
engines/mortevielle/mortevielle.cpp
engines/tony/tony.cpp
engines/toon/toon.cpp
diff --git a/engines/access/resources.cpp b/engines/access/resources.cpp
index 78d0b01..05dfd3f 100644
--- a/engines/access/resources.cpp
+++ b/engines/access/resources.cpp
@@ -58,8 +58,8 @@ bool Resources::load(Common::String &errorMessage) {
uint version = f.readUint16LE();
if (version != expectedVersion) {
errorMessage = Common::String::format(
- "Incorrect version of access.dat found. Expected %d but got %d",
- expectedVersion, version);
+ _("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ filename.c_str(), expectedVersion, 0, version, 0);
return false;
}
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index c5ee4cf..7333d35 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -986,7 +986,9 @@ bool DrasculaEngine::loadDrasculaDat() {
ver = in.readByte();
if (ver != DRASCULA_DAT_VER) {
- Common::String errorMessage = Common::String::format("File 'drascula.dat' is wrong version. Expected %d but got %d. Get it from the ScummVM website", DRASCULA_DAT_VER, ver);
+ Common::String errorMessage = Common::String::format(
+ _("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ 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 0b4ed33..b7af8cb 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -454,7 +454,9 @@ bool HugoEngine::loadHugoDat() {
int minVer = in.readByte();
if ((majVer != HUGO_DAT_VER_MAJ) || (minVer != HUGO_DAT_VER_MIN)) {
- Common::String errorMessage = Common::String::format("File 'hugo.dat' is wrong version. Expected %d.%d but got %d.%d. Get it from the ScummVM website", HUGO_DAT_VER_MAJ, HUGO_DAT_VER_MIN, majVer, minVer);
+ Common::String errorMessage = Common::String::format(
+ _("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ filename.c_str(),HUGO_DAT_VER_MAJ, HUGO_DAT_VER_MIN, majVer, minVer);
GUIErrorMessage(errorMessage);
return false;
}
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index f798ddb..9d3722c 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.cpp
@@ -73,7 +73,7 @@ Common::Error LureEngine::init() {
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",
+ GUIError(_("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
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 14391a2..fbfde90 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -318,11 +318,16 @@ Common::ErrorCode MortevielleEngine::loadMortDat() {
}
// Check the version
- if (f.readByte() < MORT_DAT_REQUIRED_VERSION) {
- GUIErrorMessage("The located mort.dat data file is too old, please download an updated version on scummvm.org");
+ int majVer = f.readByte();
+ int minVer = f.readByte();
+
+ if (majVer < MORT_DAT_REQUIRED_VERSION) {
+ Common::String msg = Common::String::format(
+ _("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ MORT_DAT, MORT_DAT_REQUIRED_VERSION, 0, majVer, minVer);
+ GUIErrorMessage(msg);
return Common::kReadingFailed;
}
- f.readByte(); // Minor version
// Loop to load resources from the data file
while (f.pos() < f.size()) {
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index c3ae24b..ec42a1d 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -217,7 +217,9 @@ bool TonyEngine::loadTonyDat() {
int minVer = in.readByte();
if ((majVer != TONY_DAT_VER_MAJ) || (minVer != TONY_DAT_VER_MIN)) {
- msg = Common::String::format("File 'tony.dat' is wrong version. Expected %d.%d but got %d.%d. Get it from the ScummVM website", TONY_DAT_VER_MAJ, TONY_DAT_VER_MIN, majVer, minVer);
+ msg = Common::String::format(
+ _("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ filename.c_str(), TONY_DAT_VER_MAJ, TONY_DAT_VER_MIN, majVer, minVer);
GUIErrorMessage(msg);
warning("%s", msg.c_str());
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 25eb7ad..ae1f8f1 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -4937,7 +4937,9 @@ bool ToonEngine::loadToonDat() {
minVer = in.readByte();
if ((majVer != TOON_DAT_VER_MAJ) || (minVer != TOON_DAT_VER_MIN)) {
- msg = Common::String::format(_("File 'toon.dat' is wrong version. Expected %d.%d but got %d.%d. Get it from the ScummVM website"), TOON_DAT_VER_MAJ, TOON_DAT_VER_MIN, majVer, minVer);
+ msg = Common::String::format(
+ _("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ filename.c_str(), TOON_DAT_VER_MAJ, TOON_DAT_VER_MIN, majVer, minVer);
GUIErrorMessage(msg);
warning("%s", msg.c_str());
Commit: 55512414dd27dd9e19a1be0714b2b25209be1669
https://github.com/scummvm/scummvm/commit/55512414dd27dd9e19a1be0714b2b25209be1669
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-12-06T14:16:37+01:00
Commit Message:
ALL: Change instructions for engine data file issues
The engine data files should be included in the package, so downloading
may not be the best suggestion. Instead refer to the README.
Changed paths:
README
engines/access/resources.cpp
engines/drascula/drascula.cpp
engines/hugo/hugo.cpp
engines/lure/lure.cpp
engines/mortevielle/mortevielle.cpp
engines/sky/compact.cpp
engines/teenagent/resources.cpp
engines/tony/tony.cpp
engines/toon/toon.cpp
diff --git a/README b/README
index 3c9474f..6f68756 100644
--- a/README
+++ b/README
@@ -1742,6 +1742,28 @@ 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 05dfd3f..96eab8b 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(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
+ errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), 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(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
+ errorMessage = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), 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' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ _("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
filename.c_str(), expectedVersion, 0, version, 0);
return false;
}
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 7333d35..efcb36c 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(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
+ Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), 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(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
+ Common::String errorMessage = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), 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' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ _("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
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 b7af8cb..b7ad700 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(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
+ Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), 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(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
+ Common::String errorMessage = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), 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' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ _("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
filename.c_str(),HUGO_DAT_VER_MAJ, HUGO_DAT_VER_MIN, majVer, minVer);
GUIErrorMessage(errorMessage);
return false;
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index 9d3722c..245aa96 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(_("You're missing the '%s' file. Get it from the ScummVM website"), SUPPORT_FILENAME);
+ GUIError(_("Unable to locate the '%s' engine data file. Read the README for instructions."), SUPPORT_FILENAME);
return Common::kUnknownError;
}
@@ -70,10 +70,10 @@ Common::Error LureEngine::init() {
f.close();
if (READ_LE_UINT16(&version.id) != 0xffff) {
- GUIError(_("File '%s' is corrupt. Get it from the ScummVM website"), SUPPORT_FILENAME);
+ GUIError(_("The '%s' engine data file is corrupt. Read the README for instructions."), SUPPORT_FILENAME);
return Common::kUnknownError;
} else if ((version.vMajor != LURE_DAT_MAJOR) || (version.vMinor != LURE_DAT_MINOR)) {
- GUIError(_("Incorrect version of the '%s' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ GUIError(_("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
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 fbfde90..203eea5 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(_("You're missing the '%s' file. Get it from the ScummVM website"), MORT_DAT);
+ Common::String msg = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), 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(_("File '%s' is corrupt. Get it from the ScummVM website"), MORT_DAT);
+ Common::String msg = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), 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' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ _("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
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 731c390..c04a2ea 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(_("You're missing the '%s' file. Get it from the ScummVM website"), 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());
GUIErrorMessage(msg);
error("%s", msg.c_str());
}
diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index ebfe5ff..8434395 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(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
+ Common::String errorMessage = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), 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 ec42a1d..c73f872 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(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
+ msg = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), 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(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
+ msg = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), 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' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ _("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
filename.c_str(), TONY_DAT_VER_MAJ, TONY_DAT_VER_MIN, majVer, minVer);
GUIErrorMessage(msg);
warning("%s", msg.c_str());
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index ae1f8f1..c17b44c 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(_("You're missing the '%s' file. Get it from the ScummVM website"), filename.c_str());
+ msg = Common::String::format(_("Unable to locate the '%s' engine data file. Read the README for instructions."), 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(_("File '%s' is corrupt. Get it from the ScummVM website"), filename.c_str());
+ msg = Common::String::format(_("The '%s' engine data file is corrupt. Read the README for instructions."), 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' file found. Expected %d.%d but got %d.%d. Get it from the ScummVM website"),
+ _("Incorrect version of the '%s' engine data file found. Expected %d.%d but got %d.%d. Read the README for instructions."),
filename.c_str(), TOON_DAT_VER_MAJ, TOON_DAT_VER_MIN, majVer, minVer);
GUIErrorMessage(msg);
warning("%s", msg.c_str());
Commit: 0e47d71928b472c78874a65d2dfec5c3791ffa02
https://github.com/scummvm/scummvm/commit/0e47d71928b472c78874a65d2dfec5c3791ffa02
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-12-06T14:50:04+01:00
Commit Message:
ALL: replace 2 more 'download engine data' instructions
Changed paths:
engines/kyra/staticres.cpp
engines/tony/tony.cpp
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 65f3198..5e52834 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() + "' file or it got corrupted, (re)get it from the ScummVM website";
+ Common::String errorMessage = "You're missing the '" + StaticResource::staticDataFilename() + "' engine data file or it got corrupted. Read the README for instructions.";
GUIErrorMessage(errorMessage);
error("%s", errorMessage.c_str());
}
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index c73f872..b1225b5 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -255,7 +255,7 @@ bool TonyEngine::loadTonyDat() {
int numVariant = in.readUint16BE();
if (expectedLangVariant > numVariant - 1) {
- msg = Common::String::format("Font variant not present in 'tony.dat'. Get it from the ScummVM website");
+ msg = Common::String::format(_("Font variant not present in '%s' engine data file. Read the README for instructions."), filename.c_str());
GUIErrorMessage(msg);
warning("%s", msg.c_str());
Commit: 722e52e27a339a5051e4a98b884dde41a95ed091
https://github.com/scummvm/scummvm/commit/722e52e27a339a5051e4a98b884dde41a95ed091
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-12-07T20:39:14+01:00
Commit Message:
README: Update TOC
Changed paths:
README
diff --git a/README b/README
index 6f68756..52adc11 100644
--- a/README
+++ b/README
@@ -52,6 +52,7 @@ 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
Commit: ebaab44cd16ae784cebb66b7cf220842808a8bde
https://github.com/scummvm/scummvm/commit/ebaab44cd16ae784cebb66b7cf220842808a8bde
Author: Ben Castricum (github at bencastricum.nl)
Date: 2016-12-08T13:38:56+01:00
Commit Message:
ALL: Leave out instructions for engine data issues
Changed paths:
README
engines/access/resources.cpp
engines/drascula/drascula.cpp
engines/hugo/hugo.cpp
engines/kyra/staticres.cpp
engines/lure/lure.cpp
engines/mortevielle/mortevielle.cpp
engines/sky/compact.cpp
engines/teenagent/resources.cpp
engines/tony/tony.cpp
engines/toon/toon.cpp
diff --git a/README b/README
index 52adc11..3c9474f 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 96eab8b..a7b23eb 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 efcb36c..655af48 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 b7ad700..6881278 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 5e52834..5a45566 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 245aa96..8eac519 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 203eea5..59004cb 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 c04a2ea..ab244c1 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 8434395..b7e0d55 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 b1225b5..8a7b676 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 c17b44c..dc1c515 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());
Commit: 0e5788f4e3b4060c4a78527815ddbdc63c9f4d67
https://github.com/scummvm/scummvm/commit/0e5788f4e3b4060c4a78527815ddbdc63c9f4d67
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-12-17T12:45:38+01:00
Commit Message:
Merge pull request #866 from BenCastricum/editing
ALL: Unify messages concerning engine data files
Changed paths:
A engines/access/POTFILES
A engines/lure/POTFILES
A engines/mortevielle/POTFILES
A engines/tony/POTFILES
engines/access/resources.cpp
engines/drascula/POTFILES
engines/drascula/drascula.cpp
engines/hugo/POTFILES
engines/hugo/hugo.cpp
engines/kyra/staticres.cpp
engines/lure/lure.cpp
engines/mortevielle/mortevielle.cpp
engines/sky/compact.cpp
engines/teenagent/resources.cpp
engines/tony/tony.cpp
engines/toon/toon.cpp
More information about the Scummvm-git-logs
mailing list