diff options
| author | Johannes Schickel | 2012-04-28 08:07:52 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2012-04-28 08:07:52 -0700 |
| commit | e2238e4a25904f36f3cf3f91b9a4db7db22f6508 (patch) | |
| tree | a5260e879ba0fe3eb2b01335f7afaac5caa9378f /engines/scumm | |
| parent | cc2b95b068b4dc7cc8dbb33578589d9d3316869c (diff) | |
| parent | bdb12a9c658fa0e8661c7a8370f1d926ed31ae62 (diff) | |
| download | scummvm-rg350-e2238e4a25904f36f3cf3f91b9a4db7db22f6508.tar.gz scummvm-rg350-e2238e4a25904f36f3cf3f91b9a4db7db22f6508.tar.bz2 scummvm-rg350-e2238e4a25904f36f3cf3f91b9a4db7db22f6508.zip | |
Merge pull request #234 from BenCastricum/master
SCUMM: Fix bug #3493317 by removing assert() in detection algorithm.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/detection.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index b47982af00..2da0abb5df 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -589,11 +589,11 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul file.c_str(), md5str.c_str(), filesize); // Sanity check: We *should* have found a matching gameid / variant at this point. - // If not, then there's a bug in our data tables... - assert(dr.game.gameid != 0); - - // Add it to the list of detected games - results.push_back(dr); + // If not, we may have #ifdef'ed the entry out in our detection_tables.h because we + // don't have the required stuff compiled in, or there's a bug in our data tables... + if (dr.game.gameid != 0) + // Add it to the list of detected games + results.push_back(dr); } } |