aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2006-04-25 23:07:59 +0000
committerEugene Sandulenko2006-04-25 23:07:59 +0000
commitbf53520130bbde8a1fb85bebae487d8b489d8f42 (patch)
tree7270b20eb9fe6fd492126eb6509db6e01739022f /engines
parent14beeb3492e7d46515d003399ecdbc393d3e1a0f (diff)
downloadscummvm-rg350-bf53520130bbde8a1fb85bebae487d8b489d8f42.tar.gz
scummvm-rg350-bf53520130bbde8a1fb85bebae487d8b489d8f42.tar.bz2
scummvm-rg350-bf53520130bbde8a1fb85bebae487d8b489d8f42.zip
- Check if path specified for a game in scummvm.ini really exists and complain
if it does not - Give more understandable feedback to user when SCUMM module can't find a game - Put TODO to kyra engine as their current detection scheme does not let easily tell if game data really present in specified directory svn-id: r22163
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/kyra.cpp7
-rw-r--r--engines/scumm/plugin.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp
index 46f228ee80..0f0595f6ec 100644
--- a/engines/kyra/kyra.cpp
+++ b/engines/kyra/kyra.cpp
@@ -299,7 +299,7 @@ KyraEngine::KyraEngine(OSystem *system)
}
if (!found) {
- printf("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team", md5str);
+ printf("Unknown MD5 (%s)! Please report the details (language, platform, etc.) of this game to the ScummVM team\n", md5str);
_features = 0;
_game = GI_KYRA1;
Common::File test;
@@ -323,6 +323,11 @@ KyraEngine::KyraEngine(OSystem *system)
_features |= GF_LNGUNK;
}
}
+
+ // FIXME: TODO:
+ // Please, deal with a case when _no_ valid game is present
+ // in specified directory. Currently it just asserts() later
+ // in the code which is not nice. [sev]
}
int KyraEngine::init() {
diff --git a/engines/scumm/plugin.cpp b/engines/scumm/plugin.cpp
index 455fec01e3..4703bf2ab0 100644
--- a/engines/scumm/plugin.cpp
+++ b/engines/scumm/plugin.cpp
@@ -1312,8 +1312,10 @@ Engine *Engine_SCUMM_create(OSystem *syst) {
detectGames(fslist, results, gameid);
// Unable to locate game data
- if (results.empty())
+ if (results.empty()) {
+ warning("ScummEngine: unable to locate game data");
return 0;
+ }
DetectorResult res(*(results.begin()));